scripts: updated scripts so that they don't repeat themselves

diff --git a/manager/scripts/_env.sh b/manager/scripts/_env.sh
index d2826dc2fb20fa6e103a23ff86bb675ff2b81da4..3bcbf4e46de3dffabb2790c925910d83003dd313 100644 (file)
--- a/manager/scripts/_env.sh
+++ b/manager/scripts/_env.sh
@@ -1,5 +1,5 @@
 # fail on errors
-set -e
+set -o errexit -o nounset
 
 # define color codes
 red="\033[0;31m"

diff --git a/manager/scripts/codecheck b/manager/scripts/codecheck
index 1f9e3cfde799859ed01f0293d3a73a1f8163b6df..882bee8741e58515c2aeb267580cadd9eb511e97 100755 (executable)
--- a/manager/scripts/codecheck
+++ b/manager/scripts/codecheck
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# fail early
-set -e
-
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh

diff --git a/manager/scripts/commit b/manager/scripts/commit
index 717fbd50e77de8882a9baa38ff3421d9bcfd6bb3..1797315958d609aa04236a85aeeec28214661e5a 100755 (executable)
--- a/manager/scripts/commit
+++ b/manager/scripts/commit
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# fail early
-set -e
-
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh

diff --git a/manager/scripts/configure-vscode b/manager/scripts/configure-vscode
index 74288489164f32561ab5bdf6669d20a247405ca7..dfbe4d6488c1a9dd5abf893848492c1bdfb379f9 100755 (executable)
--- a/manager/scripts/configure-vscode
+++ b/manager/scripts/configure-vscode
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# fail early
-set -e
-
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh

diff --git a/manager/scripts/container-build b/manager/scripts/container-build
index d1a34c2378eea1bb44b5e9f849d41a3696ba2701..032b248a8137e34bb7bf4eff3cdae733b2e2103a 100755 (executable)
--- a/manager/scripts/container-build
+++ b/manager/scripts/container-build
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# fail early
-set -e
-
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh

diff --git a/manager/scripts/make-dev-archive.sh b/manager/scripts/make-dev-archive.sh
index c72296e1ae23e39dff2ec34ec8073a20694dd6fa..45746b701238e5cba405b2f5f3ba0dd5a4aa3b5a 100755 (executable)
--- a/manager/scripts/make-dev-archive.sh
+++ b/manager/scripts/make-dev-archive.sh
@@ -1,14 +1,10 @@
 #!/bin/bash
 # create dev archive from current repo HEAD
-set -o errexit -o nounset
 
-cd "$(dirname ${0})/.."
+# ensure consistent behaviour
+src_dir="$(dirname "$(realpath "$0")")"
+source $src_dir/_env.sh
 
-if ! command -v poetry &> /dev/null
-then
-    echo "poetry is required to create archive: pip install poetry"
-    exit 1
-fi
 
 set -o xtrace
 

diff --git a/manager/scripts/run b/manager/scripts/run
index 1ed740457ea1831b339c12babc284e6a205d91ae..5097a182dc54b862a7c9288a5d02b6bd55eb9de0 100755 (executable)
--- a/manager/scripts/run
+++ b/manager/scripts/run
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# fail early
-set -e
-
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh

diff --git a/manager/scripts/run-debug b/manager/scripts/run-debug
index 4eb65241ff60e54b0beb95f976d5debe8b67dcb9..0fe6129734dfb9f4bf5c10e9eaf8e6089d11bdf6 100755 (executable)
--- a/manager/scripts/run-debug
+++ b/manager/scripts/run-debug
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# fail early
-set -e
-
 # ensure consistent behaviour
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/_env.sh