mirror of
https://github.com/wting/autojump
synced 2024-10-27 20:34:07 +00:00
only use git revision for version if .git exists
This commit is contained in:
parent
ae0e928e60
commit
52a8ee42ed
1
Makefile
1
Makefile
@ -6,7 +6,6 @@ autojump: autojump.py
|
|||||||
version=`git describe $$(git rev-list --tags --max-count=1)`
|
version=`git describe $$(git rev-list --tags --max-count=1)`
|
||||||
number=`git describe $$(git rev-list --tags --max-count=1) | sed "s/^[a-z]*-//"`
|
number=`git describe $$(git rev-list --tags --max-count=1) | sed "s/^[a-z]*-//"`
|
||||||
release:
|
release:
|
||||||
echo $(TAG)
|
|
||||||
@echo NOTE: make sure you\'re on a tagged commit
|
@echo NOTE: make sure you\'re on a tagged commit
|
||||||
git archive --format=tar --prefix autojump_$(number)/ $(version) | gzip > autojump_$(number).tar.gz
|
git archive --format=tar --prefix autojump_$(number)/ $(version) | gzip > autojump_$(number).tar.gz
|
||||||
|
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# add git revision to autojump
|
if [ -d .git ];
|
||||||
gitrevision=`git describe`
|
then
|
||||||
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
|
# add git revision to autojump
|
||||||
gitrevision=$gitrevision"-dirty"
|
gitrevision=`git describe`
|
||||||
|
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
|
||||||
|
gitrevision=$gitrevision"-dirty"
|
||||||
|
fi
|
||||||
|
sed -e "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"git revision $gitrevision\"/" autojump.py > autojump
|
||||||
|
else
|
||||||
|
cp autojump.py autojump
|
||||||
fi
|
fi
|
||||||
sed -e "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"git revision $gitrevision\"/" autojump.py > autojump
|
chmod a+rx autojump
|
||||||
chmod a+rx autojump
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user