From 22f3ccb8b942f36251081119e29ecb9bc7420aa3 Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Sat, 12 Oct 2019 13:16:39 +0200
Subject: [PATCH] contrib/*: replace || exit with global set -e parameter

---
 contrib/depdot.sh    | 7 +++----
 contrib/lsupgrade.sh | 9 +++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/depdot.sh b/contrib/depdot.sh
index cb2d3a2f..d0061d02 100755
--- a/contrib/depdot.sh
+++ b/contrib/depdot.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
 
+set -e
 # Script to output the dependency graph of Gluon's packages
 # Limitations:
 #  * Works only if directory names and package names are the same (true for all Gluon packages)
 #  * Doesn't show dependencies through virtual packages correctly
 
-
-
 shopt -s nullglob
 
 
-pushd "$(dirname "$0")/.." >/dev/null || exit
+pushd "$(dirname "$0")/.." >/dev/null
 
 
 escape_name() {
@@ -40,6 +39,6 @@ for makefile in ./package/*/Makefile; do
 	done
 done | sort -u
 
-popd >/dev/null || exit
+popd >/dev/null
 
 echo '}'
diff --git a/contrib/lsupgrade.sh b/contrib/lsupgrade.sh
index 4ca33b79..f8e28f9a 100755
--- a/contrib/lsupgrade.sh
+++ b/contrib/lsupgrade.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -e
 # Script to list all upgrade scripts in a clear manner
 # Limitations:
 #  * Does only show scripts of packages whose `files'/`luasrc' directories represent the whole image filesystem (which are all Gluon packages)
@@ -25,12 +26,12 @@ else
 fi
 
 
-pushd "$(dirname "$0")/.." >/dev/null || exit
+pushd "$(dirname "$0")/.." >/dev/null
 
 find ./package packages -name Makefile | while read -r makefile; do
 	dir="$(dirname "$makefile")"
 
-	pushd "$dir" >/dev/null || exit
+	pushd "$dir" >/dev/null
 
 	repo="$(dirname "$dir" | cut -d/ -f 2)"
 	dirname="$(dirname "$dir" | cut -d/ -f 3-)"
@@ -42,7 +43,7 @@ find ./package packages -name Makefile | while read -r makefile; do
 	for file in "${SUFFIX2}"/*; do
 		echo "${GREEN}$(basename "${file}")${RESET}" "(${BLUE}${repo}${RESET}/${dirname}${dirname:+/}${RED}${package}${RESET}/${SUFFIX2})"
 	done
-	popd >/dev/null || exit
+	popd >/dev/null
 done | sort
 
-popd >/dev/null || exit
+popd >/dev/null