mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 15:36:21 -04:00
Merge pull request #258 from spacewander/master
use mixin to add 'is git repo' check.
This commit is contained in:
commit
68455cf996
19
Makefile
19
Makefile
|
|
@ -6,6 +6,10 @@ MANS = $(wildcard man/git-*.md)
|
||||||
MAN_HTML = $(MANS:.md=.html)
|
MAN_HTML = $(MANS:.md=.html)
|
||||||
MAN_PAGES = $(MANS:.md=.1)
|
MAN_PAGES = $(MANS:.md=.1)
|
||||||
|
|
||||||
|
COMMANDS_USED_WITHOUT_GIT_REPO = git-alias git-extras git-fork git-setup
|
||||||
|
COMMANDS_USED_WITH_GIT_REPO = $(filter-out $(COMMANDS_USED_WITHOUT_GIT_REPO), \
|
||||||
|
$(subst bin/, , $(BINS)))
|
||||||
|
|
||||||
docs: $(MAN_HTML) $(MAN_PAGES)
|
docs: $(MAN_HTML) $(MAN_PAGES)
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
@ -13,9 +17,18 @@ install:
|
||||||
@mkdir -p $(DESTDIR)$(BINPREFIX)
|
@mkdir -p $(DESTDIR)$(BINPREFIX)
|
||||||
@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
|
@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
|
||||||
@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
|
@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
|
||||||
@$(foreach BIN, $(BINS), \
|
$(eval TEMPFILE := $(shell mktemp))
|
||||||
echo "... installing $(notdir $(BIN))"; \
|
@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
|
||||||
cp -f $(BIN) $(DESTDIR)$(BINPREFIX); \
|
@chmod 775 $(TEMPFILE)
|
||||||
|
@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
|
||||||
|
echo "... installing $(COMMAND)"; \
|
||||||
|
head -1 bin/$(COMMAND) | cat - ./helper/is-git-repo > $(TEMPFILE); \
|
||||||
|
tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
|
||||||
|
cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
|
||||||
|
)
|
||||||
|
@$(foreach COMMAND, $(COMMANDS_USED_WITHOUT_GIT_REPO), \
|
||||||
|
echo "... installing $(COMMAND)"; \
|
||||||
|
cp -f bin/$(COMMAND) $(DESTDIR)$(BINPREFIX); \
|
||||||
)
|
)
|
||||||
cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)
|
cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)
|
||||||
@mkdir -p $(DESTDIR)/etc/bash_completion.d
|
@mkdir -p $(DESTDIR)/etc/bash_completion.d
|
||||||
|
|
|
||||||
14
helper/is-git-repo
Executable file
14
helper/is-git-repo
Executable file
|
|
@ -0,0 +1,14 @@
|
||||||
|
#
|
||||||
|
# check whether current directory is inside a git repository
|
||||||
|
#
|
||||||
|
|
||||||
|
is_git_repo() {
|
||||||
|
git rev-parse --show-toplevel > /dev/null 2>&1
|
||||||
|
result=$?
|
||||||
|
if test $result != 0; then
|
||||||
|
>&2 echo 'Not a git repo!'
|
||||||
|
exit $result
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
is_git_repo
|
||||||
Loading…
Reference in a new issue