Skip to content

Commit cc5d8e1

Browse files
authored
Fix variable doublequoting (#4245)
1 parent 5c43513 commit cc5d8e1

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

vm/docker-vm.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)
88

9-
function header_info {
9+
function header_info() {
1010
clear
1111
cat <<"EOF"
1212
____ __ _ ____ ___
@@ -428,8 +428,8 @@ btrfs)
428428
esac
429429
for i in {0,1}; do
430430
disk="DISK$i"
431-
eval DISK"${i}"=vm-"${VMID}"-disk-"${i}"""${DISK_EXT:-"}"
432-
eval DISK"${i}"_REF="${STORAGE}":"${DISK_REF:-}"""${!disk"}"
431+
eval "DISK${i}"="vm-${VMID}-disk-${i}${DISK_EXT:-}"
432+
eval "DISK${i}_REF"="${STORAGE}:${DISK_REF:-}${!disk}"
433433
done
434434

435435
msg_info "Installing Pre-Requisite libguestfs-tools onto Host"
@@ -446,16 +446,16 @@ virt-customize -q -a "${FILE}" --install qemu-guest-agent,apt-transport-https,ca
446446
msg_ok "Added Docker and Docker Compose Plugin to Debian 12 Qcow2 Disk Image successfully"
447447

448448
msg_info "Creating a Docker VM"
449-
qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
450-
-name $HN -tags community-script,debian12,docker -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
451-
pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
452-
qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
453-
qm set $VMID \
454-
-efidisk0 ${DISK0_REF}${FORMAT} \
455-
-scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
449+
qm create "$VMID" -agent 1"${MACHINE}" -tablet 0 -localtime 1 -bios ovmf"${CPU_TYPE}" -cores "$CORE_COUNT" -memory "$RAM_SIZE" \
450+
-name "$HN" -tags community-script,debian12,docker -net0 virtio,bridge="$BRG",macaddr="$MAC"$VLAN"$MTU" -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
451+
pvesm alloc "$STORAGE" "$VMID" "$DISK0" 4M 1>&/dev/null
452+
qm importdisk "$VMID" "${FILE}" "$STORAGE" "${DISK_IMPORT:-}" 1>&/dev/null
453+
qm set "$VMID" \
454+
-efidisk0 "${DISK0_REF}"${FORMAT} \
455+
-scsi0 "${DISK1_REF}",${DISK_CACHE}${THIN}size="${DISK_SIZE}" \
456456
-boot order=scsi0 \
457457
-serial0 socket >/dev/null
458-
qm set $VMID --agent enabled=1 >/dev/null
458+
qm set "$VMID" --agent enabled=1 >/dev/null
459459

460460
DESCRIPTION=$(
461461
cat <<EOF
@@ -491,16 +491,16 @@ qm set "$VMID" -description "$DESCRIPTION" >/dev/null
491491

492492
if [ -n "$DISK_SIZE" ]; then
493493
msg_info "Resizing disk to $DISK_SIZE GB"
494-
qm resize $VMID scsi0 ${DISK_SIZE} >/dev/null
494+
qm resize "$VMID" scsi0 "${DISK_SIZE}" >/dev/null
495495
else
496496
msg_info "Using default disk size of $DEFAULT_DISK_SIZE GB"
497-
qm resize $VMID scsi0 ${DEFAULT_DISK_SIZE} >/dev/null
497+
qm resize "$VMID" scsi0 "${DEFAULT_DISK_SIZE}" >/dev/null
498498
fi
499499

500500
msg_ok "Created a Docker VM ${CL}${BL}(${HN})"
501501
if [ "$START_VM" == "yes" ]; then
502502
msg_info "Starting Docker VM"
503-
qm start $VMID
503+
qm start "$VMID"
504504
msg_ok "Started Docker VM"
505505
fi
506506
post_update_to_api "done" "none"

0 commit comments

Comments
 (0)