From 87709ff3aecc5bccdc6e5a4961b8adeb80e10b8c Mon Sep 17 00:00:00 2001
From: "alexander.kravchenko" <alexander.kravchenko@demlabs.net>
Date: Tue, 27 Oct 2020 17:48:08 +0500
Subject: [PATCH] Added pubtest branches pub support. Reviewing the repo issues

---
 linux/debian/scripts/deploy.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linux/debian/scripts/deploy.sh b/linux/debian/scripts/deploy.sh
index 353670d..4f218c4 100755
--- a/linux/debian/scripts/deploy.sh
+++ b/linux/debian/scripts/deploy.sh
@@ -28,14 +28,16 @@ for pkgfile in $PKGFILES; do
 	CODENAME=$(echo $pkgname | rev | cut -d '-' -f1 | rev)
 	cp -r ../prod_build/general/essentials/weblink-latest ../prod_build/general/essentials/$pkgname_weblink
 	sed -i "/document/s/cellframe.*deb/$pkgname_public$MOD.deb/" ../prod_build/general/essentials/$pkgname_weblink/index.php
-	if [[ $(echo $CI_COMMIT_REF_NAME | grep "master\|^release") != "" ]]; then
+	if [[ $(echo $CI_COMMIT_REF_NAME | grep "master\|^release\|^pubtest") != "" ]]; then
 		echo "REF_NAME is $CI_COMMIT_REF_NAME"
 		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "mkdir -p $CELLFRAME_FILESERVER_PATH/$SUBDIR"
 		scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/$pkgname_public$MOD.deb"
 		scp -r -i $CELLFRAME_REPO_KEY ../prod_build/general/essentials/$pkgname_weblink "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/"
 		if [[ $CI_COMMIT_REF_NAME == "master" ]]; then
+set -x
 			scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/aptly/repo_update/$pkgname_public$MOD.deb"
 			ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" -- "~/aptly/repo_update.sh"
+set +x
 		fi
 #		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"
 	fi
-- 
GitLab