diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-release | 6 | ||||
| -rwxr-xr-x | scripts/full-test.sh | 2 | ||||
| -rwxr-xr-x | scripts/test-install.sh | 2 | ||||
| -rwxr-xr-x | scripts/test-vm.sh | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build-release b/scripts/build-release index 2fbf004..9c6614e 100755 --- a/scripts/build-release +++ b/scripts/build-release @@ -12,13 +12,13 @@ # - $ARCHSETUP_INBOX (notification for test VM rebuild, if set) # - $DIST_REMOTE_HOST:$DIST_REMOTE_PATH (if set and reachable) -set -e +set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_DIR="$(dirname "$SCRIPT_DIR")" # Get actual user (not root when running with sudo) -if [[ -n "$SUDO_USER" ]]; then +if [[ -n "${SUDO_USER:-}" ]]; then REAL_USER="$SUDO_USER" REAL_HOME=$(getent passwd "$SUDO_USER" | cut -d: -f6) else @@ -140,7 +140,7 @@ distribute_remote() { # Run SCP as the real user (not root) to use their SSH keys local scp_cmd="scp" - if [[ -n "$SUDO_USER" ]]; then + if [[ -n "${SUDO_USER:-}" ]]; then scp_cmd="sudo -u $SUDO_USER scp" fi diff --git a/scripts/full-test.sh b/scripts/full-test.sh index 7728859..e500116 100755 --- a/scripts/full-test.sh +++ b/scripts/full-test.sh @@ -22,7 +22,7 @@ # 1 - One or more tests failed # 2 - Setup/infrastructure error -set -e +set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_DIR="$(dirname "$SCRIPT_DIR")" diff --git a/scripts/test-install.sh b/scripts/test-install.sh index 4f9f0d8..0314bf2 100755 --- a/scripts/test-install.sh +++ b/scripts/test-install.sh @@ -9,7 +9,7 @@ # ./test-install.sh single-disk # Run specific config # ./test-install.sh --list # List available configs -set -e +set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export PROJECT_DIR="$(dirname "$SCRIPT_DIR")" diff --git a/scripts/test-vm.sh b/scripts/test-vm.sh index 2f93bd2..66dba37 100755 --- a/scripts/test-vm.sh +++ b/scripts/test-vm.sh @@ -7,7 +7,7 @@ # ./test-vm.sh --boot-disk # Boot from existing virtual disk (after install) # ./test-vm.sh --clean # Remove VM disks and start fresh -set -e +set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_DIR="$(dirname "$SCRIPT_DIR")" |