diff --git a/client-macosx b/client-macosx index 3e487995fb61eba7f7b88fb6fe294d7c26e4a15b..26ba23081401627ec1cb26f53b26109e9b0c6f7e 160000 --- a/client-macosx +++ b/client-macosx @@ -1 +1 @@ -Subproject commit 3e487995fb61eba7f7b88fb6fe294d7c26e4a15b +Subproject commit 26ba23081401627ec1cb26f53b26109e9b0c6f7e diff --git a/daemon b/daemon index 2e1fa4ff49f592321ca92b080ec2d81190633d44..622ae14dd11c036b43e10d7c48cff4f36223440a 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 2e1fa4ff49f592321ca92b080ec2d81190633d44 +Subproject commit 622ae14dd11c036b43e10d7c48cff4f36223440a diff --git a/scripts/deploy-packages.sh b/scripts/deploy-packages.sh index c20b715375d46b40ed274e8d9195bdf2b43ba819..eb2baa877508894ce31d08fce43c508a20aa384c 100755 --- a/scripts/deploy-packages.sh +++ b/scripts/deploy-packages.sh @@ -41,7 +41,6 @@ function package_deb() echo "#########################" DISTRIBUTION_REPOSITOIRY_FOLDER=$(realpath repositories)/${DISTRIBUTION} - rm -rf ${DISTRIBUTION_REPOSITOIRY_FOLDER} mkdir -p ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf # Distributions file @@ -123,7 +122,6 @@ function package_rpm() echo "#########################" DISTRIBUTION_REPOSITOIRY_FOLDER=$(realpath repositories)/${DISTRIBUTION} - rm -rf ${DISTRIBUTION_REPOSITOIRY_FOLDER} mkdir -p ${DISTRIBUTION_REPOSITOIRY_FOLDER} # .repo file @@ -208,9 +206,6 @@ function deploy() echo "#####################################" rsync --archive --recursive --verbose --delete ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER} ${REMOTE_MANUAL_DOWNLOAD_LOCATION} - # remove deployed files - rm -rf manual-download - rm -rf repositories } @@ -231,6 +226,13 @@ function package() fi } +function remove-deployed-files() +{ + # remove deployed files + rm -rf manual-download + rm -rf repositories + rm -rf ${DISTRIBUTION_REPOSITOIRY_FOLDER} +} for i in "$@" do @@ -262,5 +264,14 @@ case $i in esac done -package -deploy + +if [ -z "${KEYID}" ]; +then + DISTRIBUTION_REPOSITOIRY_FOLDER=$(realpath repositories)/${DISTRIBUTION} + DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER=$(realpath manual-download)/${DISTRIBUTION} + deploy + remove-deployed-files +else + package + deploy +fi