diff --git a/src/test/resources/res.zip b/src/test/resources/res.zip index 7004d151..545e08d5 100644 Binary files a/src/test/resources/res.zip and b/src/test/resources/res.zip differ diff --git a/src/test/resources/selfupdate.sh b/src/test/resources/selfupdate.sh index e6f7b83c..5ecfc989 100755 --- a/src/test/resources/selfupdate.sh +++ b/src/test/resources/selfupdate.sh @@ -15,3 +15,7 @@ unzip -qo "$TMP_ZIP" -d "$BIN_FOLDER" rm "$TMP_ZIP" chmod +x "$BIN_FOLDER"/* + +echo "" +echo "Successfully upgraded GVM." +echo "" diff --git a/srv/scripts/gvm b/srv/scripts/gvm index a80a8fe8..43544807 100755 --- a/srv/scripts/gvm +++ b/srv/scripts/gvm @@ -268,10 +268,6 @@ function gvm-broadcast { function gvm-selfupdate { curl -s "$GVM_SERVICE/selfupdate" | bash - - echo "" - echo "Successfully upgraded GVM." - echo "" } # INSERT NEW COMMANDS BEFORE HERE diff --git a/srv/scripts/gvm-selfupdate b/srv/scripts/gvm-selfupdate deleted file mode 100755 index ade46754..00000000 --- a/srv/scripts/gvm-selfupdate +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -curl -s "$GVM_SERVICE/selfupdate" | bash - -echo "" -echo "Successfully upgraded GVM." -echo "" - diff --git a/srv/scripts/selfupdate.sh b/srv/scripts/selfupdate.sh index e827345b..d8b0d860 100755 --- a/srv/scripts/selfupdate.sh +++ b/srv/scripts/selfupdate.sh @@ -11,3 +11,7 @@ unzip -qo "$TMP_ZIP" -d "$BIN_FOLDER" rm "$TMP_ZIP" chmod +x "$BIN_FOLDER"/* + +echo "" +echo "Successfully upgraded GVM." +echo "" diff --git a/srv/server.groovy b/srv/server.groovy index 1ecb04c5..df5fbb3a 100644 --- a/srv/server.groovy +++ b/srv/server.groovy @@ -52,7 +52,6 @@ rm.get("/res") { req -> def files = [] files << new File('srv/scripts/gvm') files << new File('srv/scripts/gvm-init.sh') - files << new File('srv/scripts/gvm-selfupdate') def zipFile = buildZip(files) req.response.putHeader("Content-Type", "application/zip")