organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Kritika notes

This commit is contained in:
Calcitem 2020-03-21 00:05:54 +08:00
parent c84db35655
commit 2642f8f46b
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
version.sh
View File

@ -8,13 +8,13 @@ rm -f $VERSION_H
git rev-list HEAD | sort > config.git-hash git rev-list HEAD | sort > config.git-hash
LOCALVER=`wc -l config.git-hash | awk '{print $1}'` LOCALVER="$(wc -l config.git-hash | awk '{print $1}')"
TAG=`git describe --tags $(git rev-list --tags --max-count=1)` TAG="$(git describe --tags "$(git rev-list --tags --max-count=1)")"
if [ $LOCALVER \> 1 ] ; then if [ "$LOCALVER" -gt "1" ] ; then
VER=`git rev-list origin/$GIT_BRANCH | sort | join config.git-hash - | wc -l | awk '{print $1}'` VER=$(git rev-list origin/$GIT_BRANCH | sort | join config.git-hash - | wc -l | awk '{print $1}')
if [ $VER != $LOCALVER ] ; then if [ "$VER" != "$LOCALVER" ] ; then
VER="$VER+$(($LOCALVER-$VER))" VER="$VER+$((LOCALVER-VER))"
fi fi
if git status | grep -q "modified:" ; then if git status | grep -q "modified:" ; then
VER="${VER}M" VER="${VER}M"
@ -28,7 +28,7 @@ fi
rm -f config.git-hash rm -f config.git-hash
cat $TEMPLATE_FILE | sed "s/\$FULL_VERSION/$GIT_VERSION/g" > $VERSION_H sed "s/\$FULL_VERSION/$GIT_VERSION/g" < $TEMPLATE_FILE > $VERSION_H
git update-index --assume-unchanged $VERSION_H git update-index --assume-unchanged $VERSION_H