diff options
| author | sickcodes <[email protected]> | 2021-02-26 05:26:35 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-02-26 05:26:35 +0000 |
| commit | f2a49b046bb44198a0c61b27e3b1ded13312ced2 (patch) | |
| tree | 0ef1e26896f6e6df188f7d4646f9518f95eb7e1a /Dockerfile.naked | |
| parent | Change `-e NOPICKER=true` to simply do `export BOOTDISK=/home/arch/OSX-KVM/Op... (diff) | |
| download | docker-osx-f2a49b046bb44198a0c61b27e3b1ded13312ced2.tar.xz docker-osx-f2a49b046bb44198a0c61b27e3b1ded13312ced2.zip | |
Fixed subshell logic in startup scripts.
Diffstat (limited to 'Dockerfile.naked')
| -rw-r--r-- | Dockerfile.naked | 14 |
1 files changed, 8 insertions, 6 deletions
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 \ ;; \ |