From 4b278bc42c10c29fc8592d018bf2e59678cf8174 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Thu, 4 Mar 2021 12:05:41 +0000
Subject: [PATCH] Shift exits

---
 Dockerfile                               | 4 ++--
 Dockerfile.auto                          | 4 ++--
 Dockerfile.naked                         | 5 +++--
 custom/generate-specific-bootdisk.sh     | 4 ++--
 custom/generate-unique-machine-values.sh | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9dba25d..61464b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -316,7 +316,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
             --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" || exit 1 \
+            --output-env "${ENV:=/env}" \
     ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
             source "${ENV:=/env}" 2>/dev/null \
@@ -329,7 +329,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
             --mac-address "${MAC_ADDRESS}" \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
     ; } \
     ; case "$(file --brief /bootdisk)" in \
         QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
diff --git a/Dockerfile.auto b/Dockerfile.auto
index b5ac7da..1e0c84e 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -159,7 +159,7 @@ CMD echo "${BOILERPLATE}" \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
             --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" || exit 1 \
+            --output-env "${ENV:=/env}" \
     ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
             source "${ENV:=/env}" 2>/dev/null \
@@ -172,7 +172,7 @@ CMD echo "${BOILERPLATE}" \
             --mac-address "${MAC_ADDRESS}" \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"  \
     ; } \
     ; case "$(file --brief /bootdisk)" in \
         QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
diff --git a/Dockerfile.naked b/Dockerfile.naked
index b0e0871..6ac5333 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -129,7 +129,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
             --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" || exit 1 \
+            --output-env "${ENV:=/env}" \
     ; } \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
             source "${ENV:=/env}" 2>/dev/null \
@@ -142,7 +142,8 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
             --mac-address "${MAC_ADDRESS}" \
             --width "${WIDTH:-1920}" \
             --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    ; } \
     ; case "$(file --brief /bootdisk)" in \
         QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
             ;; \
diff --git a/custom/generate-specific-bootdisk.sh b/custom/generate-specific-bootdisk.sh
index f407f3d..b847a50 100755
--- a/custom/generate-specific-bootdisk.sh
+++ b/custom/generate-specific-bootdisk.sh
@@ -195,11 +195,11 @@ generate_bootdisk () {
         echo 'You specified both a custom plist file AND a custom plist url. Use one or the other.'
     elif [[ "${MASTER_PLIST_URL}" ]]; then
         wget -O "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}" \
-            || echo "Could not download ${MASTER_PLIST_URL}" && exit 1
+            || { echo "Could not download ${MASTER_PLIST_URL}" && exit 1 ; }
     else
         MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist'
         wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" \
-            || echo "Could not download ${MASTER_PLIST_URL}" && exit 1
+            || { echo "Could not download ${MASTER_PLIST_URL}" && exit 1 ; }
     fi
 
 
diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh
index f013898..6ab15b8 100755
--- a/custom/generate-unique-machine-values.sh
+++ b/custom/generate-unique-machine-values.sh
@@ -251,11 +251,11 @@ generate_serial_sets () {
         echo 'You specified both a custom plist file AND a custom plist url. Use one or the other.'
     elif [[ "${MASTER_PLIST_URL}" ]]; then
         wget -O "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}" \
-            || echo "Could not download ${MASTER_PLIST_URL}" && exit 1
+            || { echo "Could not download ${MASTER_PLIST_URL}" && exit 1 ; }
     else
         MASTER_PLIST_URL='https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/config-nopicker-custom.plist'
         wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" \
-            || echo "Could not download ${MASTER_PLIST_URL}" && exit 1
+            || { echo "Could not download ${MASTER_PLIST_URL}" && exit 1 ; }
     fi
 
     [[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh