diff --git a/general/essentials/node-stretch-latest/.htaccess b/general/essentials/node-stretch-latest/.htaccess deleted file mode 100644 index e2d575a1ddbfde1fc9b47bfd8d6f2c0ef34e4939..0000000000000000000000000000000000000000 --- a/general/essentials/node-stretch-latest/.htaccess +++ /dev/null @@ -1 +0,0 @@ -DirectoryIndex index.php index.html index.htm diff --git a/general/essentials/node-stretch-latest/index.php b/general/essentials/node-stretch-latest/index.php deleted file mode 100644 index 97a81ed68e2d1c056be0b42b832c53fb6fc3a732..0000000000000000000000000000000000000000 --- a/general/essentials/node-stretch-latest/index.php +++ /dev/null @@ -1,4 +0,0 @@ -<script> -window.onload = function(){ - document.location = '../cellframe-node-3.4-2-amd64-stretch.deb';} -</script> diff --git a/general/essentials/weblink-latest/index.php b/general/essentials/weblink-latest/index.html similarity index 100% rename from general/essentials/weblink-latest/index.php rename to general/essentials/weblink-latest/index.html diff --git a/general/update_dashboard.sh b/general/update_dashboard.sh index 381b95b9b95e2d5c0b17d0febfe658e136f6a7c9..b2a8ef65fb43eac48e533e4a2b443889f94b8a42 100755 --- a/general/update_dashboard.sh +++ b/general/update_dashboard.sh @@ -3,8 +3,9 @@ git clone https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git cd cellframe-dashboard git remote set-url origin https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git - git checkout master +git submodule init +git submodule update versionPatch=$(cat config.pri | grep 'VER_PAT =' | cut -d'=' -f 2) echo "version patch = $versionPatch" @@ -14,7 +15,7 @@ sed -i "s/VER_PAT = [0-9]\+/VER_PAT = $versionPatch/g" config.pri #update cellframe-node -cd cellframe-node && git checkout master && cd - +cd cellframe-node && git checkout master && git pull && cd - git add config.pri cellframe-node git commit -m 'update version patch' diff --git a/linux/debian/scripts/deploy.sh b/linux/debian/scripts/deploy.sh index ca31c733ba2529902c986f151da12e241c480fe0..3fba115a66a7ce2881c9a9763c501ec1bdd78d4c 100755 --- a/linux/debian/scripts/deploy.sh +++ b/linux/debian/scripts/deploy.sh @@ -28,7 +28,7 @@ for pkgfile in $PKGFILES; do mv $pkgfile $wd/$PACKAGE_PATH/$pkgname$MOD.deb || { echo "[ERR] Something went wrong in publishing the package. Now aborting."; exit -4; } 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 + sed -i "/document/s/cellframe.*deb/$pkgname_public$MOD.deb/" ../prod_build/general/essentials/$pkgname_weblink/index.html # 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"