Merge pull request #303 from mekanix/feature/fail

mekanix · web-flow · commit 643a3264860e · 2023-02-28T14:58:28.000+01:00
Fail script if error occurs
diff --git a/scripts/apply-proxy.sh b/scripts/apply-proxy.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+set -e
 
 BACKEND=$(reggae get-config BACKEND)
 PKG_PROXY=$(reggae get-config PKG_PROXY)
diff --git a/scripts/backend-init.sh b/scripts/backend-init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
   . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/base-init.sh b/scripts/base-init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
   . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/bhyve-init.sh b/scripts/bhyve-init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 TEMPFILE=$(mktemp)
 
 reggae init ${@}
diff --git a/scripts/cbsd-init.sh b/scripts/cbsd-init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
     . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/chef-provision.sh b/scripts/chef-provision.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 SERVICE="${1}"
 TYPE="${2}"
 
diff --git a/scripts/default.conf b/scripts/default.conf
@@ -1,4 +1,4 @@
-VERSION=0.3.3
+VERSION=0.3.4
 
 BACKEND=${BACKEND:-"base"}
 CBSD_WORKDIR=${CBSD_WORKDIR:-"/usr/cbsd"}
diff --git a/scripts/host-init.sh b/scripts/host-init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
   . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/import.sh b/scripts/import.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 IMAGE_PATH="${1}"
 
 if [ -z "${IMAGE_PATH}" ]; then
diff --git a/scripts/init.sh b/scripts/init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
   . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/jexec.sh b/scripts/jexec.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 help() {
   echo "Usage: ${0} [options] <jail name> <command>"
   echo ""
diff --git a/scripts/pkg-upgrade.sh b/scripts/pkg-upgrade.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
     . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/puppet-provision.sh b/scripts/puppet-provision.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 SERVICE="${1}"
 TYPE="${2}"
 
diff --git a/scripts/rmjail.sh b/scripts/rmjail.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 NAME="${1}"
 if [ -z "${NAME}" ]; then
   echo "Usage: $0 <jail>" >&2
diff --git a/scripts/salt-provision.sh b/scripts/salt-provision.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 CBSD_WORKDIR=$(sysrc -s cbsdd -n cbsd_workdir)
 SERVICE="${1}"
 TYPE="${2}"
diff --git a/scripts/scp.sh b/scripts/scp.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
   . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/service.sh b/scripts/service.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 SOCKET_DIR=${1}
 PID_FILE=${2}
 
diff --git a/scripts/shell-provision.sh b/scripts/shell-provision.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 BACKEND=$(reggae get-config BACKEND)
 SERVICE="${1}"
 TYPE="${2}"
diff --git a/scripts/ssh-ping.sh b/scripts/ssh-ping.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 SCRIPT_DIR=$(dirname $0)
 PROJECT_ROOT=$(readlink -f ${SCRIPT_DIR}/..)
 SERVICE="${1}"
diff --git a/scripts/ssh.sh b/scripts/ssh.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 SCRIPT_DIR=$(dirname $0)
 PROJECT_ROOT=$(readlink -f ${SCRIPT_DIR}/..)
 USER="${1}"
diff --git a/scripts/update-base.sh b/scripts/update-base.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
   . "/usr/local/etc/reggae.conf"
 fi
diff --git a/scripts/update-profiles.sh b/scripts/update-profiles.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -f "/usr/local/etc/reggae.conf" ]; then
     . "/usr/local/etc/reggae.conf"
 fi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=0.3.3`
	`1`	`+VERSION=0.3.4`
`2`	`2`
`3`	`3`	`BACKEND=${BACKEND:-"base"}`
`4`	`4`	`CBSD_WORKDIR=${CBSD_WORKDIR:-"/usr/cbsd"}`