diff options
| -rw-r--r-- | Dockerfile | 20 | ||||
| -rw-r--r-- | Dockerfile.auto | 14 | ||||
| -rw-r--r-- | Dockerfile.naked | 14 |
3 files changed, 27 insertions, 21 deletions
@@ -271,24 +271,26 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null | directory* ) export IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img \ ;; \ esac \ - ; [[ "${NOPICKER}" == true ]] && BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \ - ; [[ "${GENERATE_UNIQUE}" == true ]] \ - && ./Docker-OSX/custom/generate-unique-machine-values.sh \ + ; [[ "${NOPICKER}" == true ]] && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \ + ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ + ./Docker-OSX/custom/generate-unique-machine-values.sh \ --count 1 \ --tsv ./serial.tsv \ --bootdisks \ - --output-bootdisk "${BOOTDISK}" \ - --output-env "${ENV}" \ - && source "${ENV}" \ - ; [[ "${GENERATE_SPECIFIC}" == true ]] \ - && source /env \ + --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ + --output-env "${ENV:=/env}" \ + && source "${ENV}" \ + ; } \ + ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ + source /env \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ --board-serial "${BOARD_SERIAL}" \ --uuid "${UUID}" \ --mac-address "${MAC_ADDRESS}" \ - --output-bootdisk "${BOOTDISK}" \ + --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 0015e4a..eeb9a7b 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -141,19 +141,20 @@ ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a secur CMD echo "${BOILERPLATE}" \ && [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \ - && echo "Disk is being copied between layers... Please wait a minute..." \ + ; echo "Disk is being copied between layers... Please wait a minute..." \ && sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \ ; [[ "${NOPICKER}" == true ]] && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \ - ; [[ "${GENERATE_UNIQUE}" == true ]] \ - && ./Docker-OSX/custom/generate-unique-machine-values.sh \ + ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ + ./Docker-OSX/custom/generate-unique-machine-values.sh \ --count 1 \ --tsv ./serial.tsv \ --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}" \ + ; } \ + ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ + source /env \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ @@ -161,6 +162,7 @@ CMD echo "${BOILERPLATE}" \ --uuid "${UUID}" \ --mac-address "${MAC_ADDRESS}" \ --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 4ae385b..b31c4ad 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -116,17 +116,18 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null | nohup Xvfb :99 -screen 0 1920x1080x16 \ & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ ; } \ - ; [[ "${NOPICKER}" == true ]] && mv ./Launch-nopicker.sh ./Launch.sh \ - ; [[ "${GENERATE_UNIQUE}" == true ]] \ - && ./Docker-OSX/custom/generate-unique-machine-values.sh \ + ; [[ "${NOPICKER}" == true ]] && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \ + ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ + ./Docker-OSX/custom/generate-unique-machine-values.sh \ --count 1 \ --tsv ./serial.tsv \ --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}" \ + ; } \ + ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ + source /env \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ @@ -134,6 +135,7 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null | --uuid "${UUID}" \ --mac-address "${MAC_ADDRESS}" \ --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ + ; } \ ; case "$(file --brief /bootdisk)" in \ QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \ ;; \ |