chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-04 18:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conditionals in packaging scripts

Browse Source
This commit is contained in:
Phil Olynyk 2020-04-17 13:15:44 -04:00
parent c58509d655
commit 729d930f83
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Building/Linux/mkDebian9.sh
View File

@ -20,6 +20,7 @@ if [[ ${VERSION} == *-* ]]; then
VERSION="${VERSION}~${PRERELEASE}"
fi
GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h`
echo Version: ${VERSION}
# application name
appli_name="OSCAR"
@ -29,7 +30,7 @@ pre_rem="rm_usrbin.sh"
post_rem="clean_rm.sh"
# build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build"
if [ -n ${PRERELEASE} ] && [ ${RC} ] ; then
if [[ -n ${PRERELEASE} && ${RC} ]] ; then
appli_name=${appli_name}-test
post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh"

3
Building/Linux/mkUbuntu.sh
View File

@ -20,6 +20,7 @@ if [[ ${VERSION} == *-* ]]; then
VERSION="${VERSION}~${PRERELEASE}"
fi
GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h`
echo Version: ${VERSION}
# application name
appli_name="OSCAR"
@ -29,7 +30,7 @@ pre_rem="rm_usrbin.sh"
post_rem="clean_rm.sh"
# build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build"
if [ -n ${PRERELEASE} ] && [ -z ${RC} ] ; then
if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then
appli_name=${appli_name}-test
post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh"