From c5aab3020d28c344912e0719f0c4b9059361d633 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Thu, 25 Feb 2021 18:16:24 +0000
Subject: [PATCH] Set defaults in obvious places

---
 Dockerfile       | 12 ++++++++----
 Dockerfile.auto  |  4 ++++
 Dockerfile.naked |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae3cceb..5b2080c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -227,8 +227,12 @@ USER arch
 
 ENV USER arch
 
+ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
+
 ENV DISPLAY=:0.0
 
+ENV ENV=/env
+
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
 
 ENV NETWORKING=e1000-82545em
@@ -236,8 +240,8 @@ ENV NETWORKING=e1000-82545em
 
 ENV NOPICKER=false
 
-# Boolean for generating a bootdisk with new serials.
 ENV UNIQUE=false
+# Boolean for generating a bootdisk with new serials.
 
 VOLUME ["/tmp/.X11-unix"]
 
@@ -273,8 +277,8 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null |
         --count 1 \
         --tsv ./serial.tsv \
         --bootdisks \
-        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-        --output-env "${ENV:=/env}" \
+        --output-bootdisk "${BOOTDISK}" \
+        --output-env "${ENV}" \
     && source "${ENV}" \
     ; [[ "${GENERATE_SPECIFIC}" == true ]] \
             && source /env \
@@ -284,7 +288,7 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null |
             --board-serial "${BOARD_SERIAL}" \
             --uuid "${UUID}" \
             --mac-address "${MAC_ADDRESS}" \
-            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK}" \
     ; case "$(file --brief /bootdisk)" in \
         QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
             ;; \
diff --git a/Dockerfile.auto b/Dockerfile.auto
index 3c59fa6..d24e295 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -131,6 +131,10 @@ ENV DISPLAY=:99
 
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
 
+ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
+
+ENV ENV=/env
+
 ENV NOPICKER=true
 
 ENV TERMS_OF_USE=i_agree
diff --git a/Dockerfile.naked b/Dockerfile.naked
index 5c76e75..cc4b8fd 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -101,12 +101,16 @@ RUN mkdir -p ~/.ssh \
     && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
     && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'
 
-ENV NOPICKER=true
+ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
 
 ENV DISPLAY=:99
 
+ENV ENV=/env
+
 ENV IMAGE_PATH=/image
 
+ENV NOPICKER=true
+
 CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \
     ; [[ "${DISPLAY}" = ':99' ]] && { \
         nohup Xvfb :99 -screen 0 1920x1080x16 \