From 84326051cae737c7897823b2aabf5dc2c711cfa9 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Fri, 26 Feb 2021 05:30:09 +0000 Subject: [PATCH] source "${ENV:=/env}" logic --- Dockerfile | 3 +-- Dockerfile.auto | 3 +-- Dockerfile.naked | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3625431..e2701f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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}" \ diff --git a/Dockerfile.auto b/Dockerfile.auto index eeb9a7b..b280e7f 100644 --- 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}" \ diff --git a/Dockerfile.naked b/Dockerfile.naked index b31c4ad..7c755e4 100644 --- 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}" \