diff --git a/prod_build/general/chroot_wrap.sh b/prod_build/general/chroot_wrap.sh index 36dddf2c72abecc825c3d21bac2d72d77dcf152b..206375b1cf5d8c7c7b6ae85aaada438f146a76f7 100755 --- a/prod_build/general/chroot_wrap.sh +++ b/prod_build/general/chroot_wrap.sh @@ -48,4 +48,5 @@ done #[ $(mount | grep "/run/schroot/mount") ] && sudo umount -l /run/schroot/mount && sudo rm -r /run/schroot/mount/* #Removing mountpoint odds. cd $wd + exit $errcode diff --git a/prod_build/linux/debian/scripts/cleanup.sh b/prod_build/linux/debian/scripts/cleanup.sh index 9edda6f8bad8fce76e813fc731f4b7ae83b73414..b5b79d287ac3acfcc59a300bec295acef4931626 100755 --- a/prod_build/linux/debian/scripts/cleanup.sh +++ b/prod_build/linux/debian/scripts/cleanup.sh @@ -1,3 +1,4 @@ #!/bin/bash make distclean +exit 0 diff --git a/prod_build/linux/debian/scripts/compile_and_pack.sh b/prod_build/linux/debian/scripts/compile_and_pack.sh index 2aa75355d06394c6a62addd41759734a1b95956a..d4307fa4eed4777a6287ece60d5bf6f35adef1ce 100755 --- a/prod_build/linux/debian/scripts/compile_and_pack.sh +++ b/prod_build/linux/debian/scripts/compile_and_pack.sh @@ -21,7 +21,6 @@ substitute_pkgname_postfix() { #CODENAME=$(lsb_release -a | grep Codename | cut -f2) #VERSION=$(lsb_release -a | grep Version | cut -f2) #DISTRO_TYPE=$(lsb_release -a | grep Distributor | cut -f2) -set -x for variable in $(lsb_release -a 2>/dev/null | sed 's/\t//g' | sed 's/ //g' | sed 's/\:/\=/g'); do echo "variable is $variable" export $variable @@ -34,7 +33,6 @@ set -x export -n "Release" export -n "Codename" export -n "Description" -set +x } diff --git a/prod_build/linux/debian/scripts/deploy.sh b/prod_build/linux/debian/scripts/deploy.sh index 8a4a7c14d193cfb15126bd9ef3ff1aa5bc1a21cb..3ff0fcf7f7ad539e6111f08b832ad8014b35c4f7 100755 --- a/prod_build/linux/debian/scripts/deploy.sh +++ b/prod_build/linux/debian/scripts/deploy.sh @@ -1,5 +1,7 @@ #!/bin/bash + +set -x repack() { DEBNAME=$1 @@ -24,21 +26,26 @@ PKGFILES=($(ls *.deb)) cd .. mv build/*.deb $wd/$PACKAGE_PATH/ || echo "[ERR] Something went wrong in publishing the package. Now aborting." +#echo "We have $DISTR_CODENAME there" +echo "On path $REPO_DIR_SRC we have debian files." + NOTONBUILDSERVER=0 gitlab-runner -v 2&>> /dev/null || NOTONBUILDSERVER=$? if [[ $NOTONBUILDSERVER == 0 ]]; then mkdir -p $REPO_DIR_SRC - cd $REPO_DIR_SRC for pkgfile in $PKGFILES; do + cd $REPO_DIR_SRC cp -v $wd/$PACKAGE_PATH/$pkgfile $REPO_DIR_SRC for variant in $HOST_DISTR_VERSIONS; do ls $pkgfile | grep $variant && DISTR_CODENAME=$variant #Since we add a postfix into every debpackage done, we'll extract it that way. done repack $pkgfile + echo "Attempting to add packages into $DISTR_COMPONENT section to $DISTR_CODENAME" + cd $REPO_DIR + sudo reprepro -C "$DISTR_COMPONENT" --ask-passphrase includedeb "$DISTR_CODENAME" $REPO_DIR_SRC/*.deb + sudo reprepro export "$DISTR_CODENAME" done - cd $REPO_DIR - echo "Attempting to add packages into $DISTR_VARIANT section to $DISTR_CODENAME" - sudo reprepro -C "$DISTR_COMPONENT" --ask-passphrase includedeb "$DISTR_CODENAME" $REPO_DIR_SRC/*.deb + #Update into reprepro: #Need to create latest symlink to the project. @@ -46,6 +53,8 @@ fi export -n "UPDVER" rm -r $REPO_DIR_SRC cd $wd +set +x +exit 0 #symlink name-actual to the latest version. #build/deb/versions - for all files #build/deb/${PROJECT}-latest - for symlinks.