diff --git a/build.sh b/build.sh index 6c799b6..9cbac5e 100755 --- a/build.sh +++ b/build.sh @@ -19,11 +19,11 @@ arm_version=`git log --decorate -1 | sed -n '1p' | awk '{print substr($2,0)}'` arm_build_date=`date +"%Y-%m-%d-%H:%M:%S"` #判断tag是否存在 -if [ -z `git log --decorate -1 | grep -oP '(?<=tag: ).*'` ] +if [ -z `git log --decorate -1 | grep -oP '(?<=tag: ).*' | awk '{print substr($1,0)}'` ] then arm_tag="NULL"; else - arm_tag=`git log --decorate -1 | grep -oP '(?<=tag: ).*'` + arm_tag=`git log --decorate -1 | grep -oP '(?<=tag: ).*' | awk '{print substr($1,0)}'` arm_tag=${arm_tag%?} fi