submodules: update nightly branch

client-macosx @ 26ba2308

-Subproject commit 3e487995fb61eba7f7b88fb6fe294d7c26e4a15b
+Subproject commit 26ba23081401627ec1cb26f53b26109e9b0c6f7e

daemon @ 622ae14d

-Subproject commit 2e1fa4ff49f592321ca92b080ec2d81190633d44
+Subproject commit 622ae14dd11c036b43e10d7c48cff4f36223440a

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
 
+
+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