source "${ENV:=/env}" logic

4 years ago · 84326051ca
parent f2a49b046b
commit 84326051ca
3 changed files with 3 additions and 6 deletions
--- a/3
+++ b/3
@ -279,10 +279,9 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null |
        --bootdisks \
        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
        --output-env "${ENV:=/env}" \
-        && source "${ENV}" \
    ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source /env \
+            source "${ENV:=/env}" \
            || ./Docker-OSX/custom/generate-specific-bootdisk.sh \
            --model "${DEVICE_MODEL}" \
            --serial "${SERIAL}" \
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@ -151,10 +151,9 @@ CMD echo "${BOILERPLATE}" \
        --bootdisks \
        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
        --output-env "${ENV:=/env}" \
-        && source "${ENV}" \
    ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source /env \
+            source "${ENV:=/env}" \
            || ./Docker-OSX/custom/generate-specific-bootdisk.sh \
            --model "${DEVICE_MODEL}" \
            --serial "${SERIAL}" \
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@ -124,10 +124,9 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null |
        --bootdisks \
        --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
        --output-env "${ENV:=/env}" \
-        && source "${ENV}" \
    ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source /env \
+            source "${ENV}" \
            || ./Docker-OSX/custom/generate-specific-bootdisk.sh \
            --model "${DEVICE_MODEL}" \
            --serial "${SERIAL}" \