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 | |
| 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')
| -rw-r--r-- | Dockerfile | 20 |
1 files changed, 11 insertions, 9 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 \ ;; \ |