fix: Quote variables (#1)

This commit is contained in:
Kroese 2024-06-02 22:49:17 +02:00 committed by GitHub
parent c274de7697
commit 9b4ecd8baf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions

View file

@ -26,9 +26,9 @@ RUN set -eu && \
COPY --chmod=755 ./src /run/
ADD --chmod=755 $REPO_OSX_KVM/$VERSION_OSX_KVM/fetch-macOS-v2.py /run/
ADD --chmod=755 $REPO_OSX_KVM/$VERSION_OSX_KVM/OpenCore/OpenCore.qcow2 /images/
ADD --chmod=755 \
COPY --chmod=755 $REPO_OSX_KVM/$VERSION_OSX_KVM/fetch-macOS-v2.py /run/
COPY --chmod=755 $REPO_OSX_KVM/$VERSION_OSX_KVM/OpenCore/OpenCore.qcow2 /images/
COPY --chmod=755 \
$REPO_OSX_KVM/$VERSION_OSX_KVM/OVMF_CODE.fd \
$REPO_OSX_KVM/$VERSION_OSX_KVM/OVMF_VARS.fd \
$REPO_OSX_KVM/$VERSION_OSX_KVM/OVMF_VARS-1024x768.fd \

View file

@ -41,6 +41,6 @@ BOOT_OPTS="$BOOT_OPTS -drive if=pflash,format=raw,readonly=on,file=$OVMF/$ROM"
BOOT_OPTS="$BOOT_OPTS -drive if=pflash,format=raw,file=$OVMF/$VARS"
# OpenCoreBoot
BOOT_OPTS="$BOOT_OPTS -device ide-hd,drive=$BOOT_DRIVE_ID,bus=$BOOT_DRIVE_BUS,rotation_rate=1,bootindex=1"
BOOT_OPTS="$BOOT_OPTS -drive file="$BOOT_DRIVE",id=$BOOT_DRIVE_ID,format=qcow2,cache=writeback,aio=threads,discard=on,detect-zeroes=on,if=none"
BOOT_OPTS="$BOOT_OPTS -drive file=$BOOT_DRIVE,id=$BOOT_DRIVE_ID,format=qcow2,cache=writeback,aio=threads,discard=on,detect-zeroes=on,if=none"
return 0
return 0

View file

@ -11,9 +11,9 @@ BASE_IMG_BUS="ide.4"
downloadImage() {
local msg="Downloading $APP $VERSION image..."
info "$msg" && html "$msg"
/run/fetch-macOS-v2.py -s $VERSION
/run/fetch-macOS-v2.py -s "$VERSION"
dmg2img -i BaseSystem.dmg "$BASE_IMG"
echo $VERSION > $STORAGE/$PROCESS.version
echo "$VERSION" > "$STORAGE/$PROCESS.version"
rm -f BaseSystem.dmg
}
@ -25,7 +25,7 @@ STORED_VERSION=$(cat "$STORAGE/$PROCESS.version")
if [ "$VERSION" != "$STORED_VERSION" ]; then
info "Different version detected switching base image from $STORED_VERSION to $VERSION"
rm -f $BASE_IMG
rm -f "$BASE_IMG"
downloadImage
fi