Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "bugfix: buildsteps scripts if checks rework" into develop

This commit is contained in:
KG6JEI 2016-06-01 04:13:48 +00:00 committed by Gerrit Code Review
parent 3bae69cc5c bbf5a70052
commit b0ba904425
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/buildsteps/001-prepbuild
View File

@ -16,7 +16,7 @@ cat feeds.conf.default >> feeds.conf
SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' )
SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}')
if ( -z "$BUILD_SET_VERSION" ); then if [ ! -z "$BUILD_SET_VERSION" ]; then
echo "$BUILD_SET_VERSION" > "$BUILDROOTBASE/files/etc/mesh-release" echo "$BUILD_SET_VERSION" > "$BUILDROOTBASE/files/etc/mesh-release"
else else
echo "${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" > "$BUILDROOTBASE/files/etc/mesh-release" echo "${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" > "$BUILDROOTBASE/files/etc/mesh-release"

2
build/buildsteps/003-buildimage.sh
View File

@ -26,7 +26,7 @@ rm -Rf staging_dir/*
SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' )
SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}')
if ( -z "$BUILD_SET_VERSION" ); then if [ ! -z "$BUILD_SET_VERSION" ]; then
MYBUILDNAME="$BUILD_SET_VERSION" MYBUILDNAME="$BUILD_SET_VERSION"
else else
MYBUILDNAME="${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" MYBUILDNAME="${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}"

2
build/tests-prebuild.sh
View File

@ -33,7 +33,7 @@
LICENSE LICENSE
if [[ $OSTYPE == darwin* ]] if [ "${OSTYPE#*darwin}" != "$OSTYPE" ]
then then
export SCRIPTBASE=$(dirname $0) export SCRIPTBASE=$(dirname $0)
else else