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

Rearrange code to make it more readable

Browse Source
This commit is contained in:
Phil Olynyk 2020-05-04 20:32:51 -04:00
parent 1b453e2fa5
commit 17e5f92cbf
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Building/Linux/mkDistDeb.sh
View File

@ -37,9 +37,6 @@ echo Version: ${VERSION}
# application name # application name
appli_name="OSCAR" appli_name="OSCAR"
pre_inst="tst_user.sh" pre_inst="tst_user.sh"
post_inst="ln_usrbin.sh"
pre_rem="rm_usrbin.sh"
post_rem="clean_rm.sh"
# build folder (absolute path is better) # build folder (absolute path is better)
build_folder="/home/$USER/OSCAR/build" build_folder="/home/$USER/OSCAR/build"
if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then
@ -47,6 +44,10 @@ if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then
post_inst="ln_usrbin-test.sh" post_inst="ln_usrbin-test.sh"
pre_rem="rm_usrbin-test.sh" pre_rem="rm_usrbin-test.sh"
post_rem="clean_rm-test.sh" post_rem="clean_rm-test.sh"
else
post_inst="ln_usrbin.sh"
pre_rem="rm_usrbin.sh"
post_rem="clean_rm.sh"
fi fi
# temporary folder (absolute path is better) # temporary folder (absolute path is better)
@ -55,7 +56,7 @@ temp_folder="/home/$USER/tmp_deb_${appli_name}/"
# destination folder in the .deb file # destination folder in the .deb file
dest_folder="/usr/" dest_folder="/usr/"
# the .deb file mustn't exist (or fpm must have -f parameter to force the creation) # the .deb file mustn't exist
archi_tmp=$(lscpu | grep -i architecture | awk -F: {'print $2'} | tr -d " ") archi_tmp=$(lscpu | grep -i architecture | awk -F: {'print $2'} | tr -d " ")
if [ "$archi_tmp" = "x86_64" ];then if [ "$archi_tmp" = "x86_64" ];then
archi="amd64" archi="amd64"
@ -64,6 +65,13 @@ else
fi fi
deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb" deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb"
# if deb file exists, fatal error
if [ -f "./$deb_file" ]; then
echo "destination file (./$deb_file) exists. fatal error"
exit
fi
# retrieve packages version for the dependencies
getPkg libqt5core getPkg libqt5core
qtver=$PKGVERS qtver=$PKGVERS
@ -73,12 +81,6 @@ dblPkg=$PKGNAME
echo "QT version " $qtver echo "QT version " $qtver
echo "DblConv package " $dblPkg echo "DblConv package " $dblPkg
# if deb file exists, fatal error
if [ -f "./$deb_file" ]; then
echo "destination file (./$deb_file) exists. fatal error"
exit
fi
# clean folders need to create the package # clean folders need to create the package
if [ -d "${temp_folder}" ]; then if [ -d "${temp_folder}" ]; then
rm -r ${temp_folder} rm -r ${temp_folder}