Skip to content

Commit 5aa2cd7

Browse files
committed
installer: remove all leading and trainling separators from tag name
1 parent e57050e commit 5aa2cd7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

buildScripts/travis/after_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ case $TRAVIS_OS_NAME in
1212
;;
1313
*) exit 1 ;;
1414
esac
15-
QTBIN=${QTBIN:-$(qmake -query QT_HOST_BINS)}
15+
QTBIN=${QTBIN:-$($EXECUTOR qmake -query QT_HOST_BINS)}
1616
df -h .
1717

1818
if $INSTALLER && ! $TIMEOUT && [ "$TRAVIS_REPO_SLUG" == "trikset/trik-studio" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]

installer/build-installer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ PATH=$QT_DIR/bin:$PATH
3636
# FULL_VERSION is like v3.3.0[-rc9][-20-abc123][-dirty]
3737
FULL_VERSION=$($binary_path -platform minimal --version | grep -Eo '[^ ]+$')
3838
#QT IFW want version like [0-9]+((.|-)[0-9]+)*
39-
VERSION=$(echo $FULL_VERSION | sed -e 's/[^0-9.-]//g' -e 's/[^0-9]$//g' )
39+
VERSION=$(echo $FULL_VERSION | sed -e 's/[^0-9.-]//g' -e 's/[.-]*$//g' -e 's/^[.-]*//g')
4040
grep -r -l --include=*.xml '<Version>.*</Version>' . | xargs $GNU_SED_COMMAND -i -e "s/<Version>.*<\/Version>/<Version>$VERSION<\/Version>/"
4141
cd config
4242
grep -r -l --include=*.xml '<Version>.*</Version>' . | xargs $GNU_SED_COMMAND -i -e "s/<Version>.*<\/Version>/<Version>$FULL_VERSION<\/Version>/"

0 commit comments

Comments
 (0)