14344: Move "set -e" back to top.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/build/go-python-package-scripts/postinst b/build/go-python-package-scripts/postinst
index 095872fe247379b18640898e6d1313ca70e52288..ab2568ab9b8f940a07aa83e86ad7b45ba6501ab1 100755 (executable)
--- a/build/go-python-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+set -e
+
 # Detect rpm-based systems: the exit code of the following command is zero
 # on rpm-based systems
-/usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1
-
-if [ "$?" = "0" ]; then
+if /usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
@@ -20,7 +20,6 @@ else
     prefix=/usr
 fi
 
-set -e
 case "${pkgtype}-${1}" in
     deb-configure | rpm-1)
         dest_dir="/lib/systemd/system"

diff --git a/build/go-python-package-scripts/prerm b/build/go-python-package-scripts/prerm
index b2908e2f31e7f1480674de7693e8bd4d03bf9f83..c0f45d60c698cb77f9c2472d7d18b5d3715b33c9 100755 (executable)
--- a/build/go-python-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+set -e
+
 # Detect rpm-based systems: the exit code of the following command is zero
 # on rpm-based systems
-/usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1
-
-if [ "$?" = "0" ]; then
+if /usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
@@ -20,7 +20,6 @@ else
     prefix=/usr
 fi
 
-set -e
 case "${pkgtype}-${1}" in
     deb-remove | rpm-0)
         if [ -e /run/systemd/system ]; then