Fix shellcheck warnings (#15)

Suggest spell check and shellcheck vscode plugin Fix shellcheck warnings
gardenlinux · Dec 6, 2023 · 40ae93b · 40ae93b
1 parent ac1c3d4
commit 40ae93b
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 141 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "streetsidesoftware.code-spell-checker",
+        "timonwong.shellcheck"
+    ]
+}
diff --git a/debian/features/ostreeImage/image.ostree.raw b/debian/features/ostreeImage/image.ostree.raw
@@ -9,9 +9,9 @@ REMOTE_ARCHIVE_NAME=ostree-${OS_NAME}-repo-${BUILDER_ARCH}.tar.gz
 LOCAL_ARCHIVE_PATH=/builder/features/ostreeImage/$REMOTE_ARCHIVE_NAME
 REMOTE_REPO_PATH=${OS_NAME}-repo-${BUILDER_ARCH}
 echo Build Configuration:
-echo REMOTE_URL:           $REMOTE_URL
-echo REMOTE_REPO_PATH:     $REMOTE_REPO_PATH
-echo OS_NAME:              $OS_NAME
+echo REMOTE_URL:           "$REMOTE_URL"
+echo REMOTE_REPO_PATH:     "$REMOTE_REPO_PATH"
+echo OS_NAME:              "$OS_NAME"
 
 export PATH="/builder/image.d:$PATH"
 
@@ -22,7 +22,7 @@ MYROOT="$(mktemp -d)"
 mount -t tmpfs tmpfs "$MYROOT"
 mkdir -p "$MYROOT"/sysroot
 mkdir -p "$MYROOT"/sysroot/ostree/deploy
-mkdir -p "$MYROOT"/sysroot/ostree/deploy/${OS_NAME}/var
+mkdir -p "$MYROOT"/sysroot/ostree/deploy/"${OS_NAME}"/var
 OSTREE_SYSROOT="$MYROOT/sysroot"
 OSTREE_REPO=$OSTREE_SYSROOT/ostree/repo
 OSTREE_REF="${OS_NAME}/testing/$BUILDER_ARCH"
@@ -32,58 +32,58 @@ output="$2"
 
 tar xf "$rootfs" -C "$rootfs_work"
 
-mkdir -p $OSTREE_REPO
-mkdir -p $OSTREE_SYSROOT
+mkdir -p "$OSTREE_REPO"
+mkdir -p "$OSTREE_SYSROOT"
 
-if [ -f $LOCAL_ARCHIVE_PATH ]; then
-    echo Found local OSTree repo file at $LOCAL_ARCHIVE_PATH, using it to build the image
-    tar xf $LOCAL_ARCHIVE_PATH --directory $OSTREE_REPO
+if [ -f "$LOCAL_ARCHIVE_PATH" ]; then
+    echo Found local OSTree repo file at "$LOCAL_ARCHIVE_PATH", using it to build the image
+    tar xf "$LOCAL_ARCHIVE_PATH" --directory "$OSTREE_REPO"
 else
     echo Did not find a local OSTree repo file, downloading from remote repo
     download="$(mktemp -d)"
-    pushd $download
-    curl -fsSL --remote-name $REMOTE_URL/$REMOTE_ARCHIVE_NAME
-    tar xf $REMOTE_ARCHIVE_NAME --directory $OSTREE_REPO
-    ls -l $OSTREE_REPO
+    pushd "$download"
+    curl -fsSL --remote-name "$REMOTE_URL"/"$REMOTE_ARCHIVE_NAME"
+    tar xf "$REMOTE_ARCHIVE_NAME" --directory "$OSTREE_REPO"
+    ls -l "$OSTREE_REPO"
     popd
-    rm -rf $download
+    rm -rf "$download"
 fi
 
-ostree admin deploy --karg=root=LABEL=ROOT --karg-append=rw --karg-append=efi=runtime --sysroot=$OSTREE_SYSROOT --os=${OS_NAME} $OSTREE_REF
+ostree admin deploy --karg=root=LABEL=ROOT --karg-append=rw --karg-append=efi=runtime --sysroot="$OSTREE_SYSROOT" --os="${OS_NAME}" "$OSTREE_REF"
 
-boot_hash=`ls "$OSTREE_SYSROOT"/ostree/boot.1.1/${OS_NAME}/`
-mkdir -p "$OSTREE_SYSROOT"/ostree/boot.1.1/${OS_NAME}/$boot_hash/0/sysroot
+boot_hash=$(ls "$OSTREE_SYSROOT"/ostree/boot.1.1/"${OS_NAME}"/)
+mkdir -p "$OSTREE_SYSROOT"/ostree/boot.1.1/"${OS_NAME}"/"$boot_hash"/0/sysroot
 
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/home
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/home/user
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/roothome
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/opt
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/srv
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/home
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/home/user
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/roothome
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/opt
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/srv
 
-chown 1000:1000 "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/home/user
+chown 1000:1000 "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/home/user
 
 # Build disk image, this is hacky as of now, needs rework
 # Setup bootloader
 boot_dir=$(mktemp -d)
-cp -r $OSTREE_SYSROOT/boot/* $boot_dir
+cp -r "$OSTREE_SYSROOT"/boot/* "$boot_dir"
 LOADER_TEMP=$(mktemp -d)
-rm -rf $boot_dir/loader
+rm -rf "$boot_dir"/loader
 # move to temp dir to avoid errors with systemd-boot install
-mv $boot_dir/loader.1 $LOADER_TEMP
-mkdir -p $rootfs_work/boot/efi
-mount --bind $boot_dir $rootfs_work/boot/efi
-mount --rbind /proc $rootfs_work/proc
-mount --rbind /sys $rootfs_work/sys
-SYSTEMD_ESP_PATH=/boot/efi chroot $rootfs_work /usr/bin/bootctl --no-variables install
-umount -l $rootfs_work/proc
-umount -l $rootfs_work/sys
-umount $rootfs_work/boot/efi
+mv "$boot_dir"/loader.1 "$LOADER_TEMP"
+mkdir -p "$rootfs_work"/boot/efi
+mount --bind "$boot_dir" "$rootfs_work"/boot/efi
+mount --rbind /proc "$rootfs_work"/proc
+mount --rbind /sys "$rootfs_work"/sys
+SYSTEMD_ESP_PATH=/boot/efi chroot "$rootfs_work" /usr/bin/bootctl --no-variables install
+umount -l "$rootfs_work"/proc
+umount -l "$rootfs_work"/sys
+umount "$rootfs_work"/boot/efi
 # recover from temp dir
-cp -r $LOADER_TEMP/* $boot_dir/loader.1
-cp -r $LOADER_TEMP/* $boot_dir/loader
-cp $boot_dir/loader/loader.1/entries/* $boot_dir/loader/entries
-cat $boot_dir/loader/entries/*
-echo 'timeout 7' > $boot_dir/loader/loader.conf
+cp -r "$LOADER_TEMP"/* "$boot_dir"/loader.1
+cp -r "$LOADER_TEMP"/* "$boot_dir"/loader
+cp "$boot_dir"/loader/loader.1/entries/* "$boot_dir"/loader/entries
+cat "$boot_dir"/loader/entries/*
+echo 'timeout 7' > "$boot_dir"/loader/loader.conf
 
 efi_partition=$(mktemp)
 root_partition=$(mktemp)
@@ -92,7 +92,7 @@ partitions=$(mktemp)
 # fixme: make disk size dynamic
 truncate -s 500M "$efi_partition"
 # make_reproducible_vfat $OSTREE_SYSROOT/boot "$efi_partition"
-make_reproducible_vfat -t 11111111 $boot_dir "$efi_partition"
+make_reproducible_vfat -t 11111111 "$boot_dir" "$efi_partition"
 size_uefi=$(du -b "$efi_partition" | awk '{ padded_size = $1 + (MB - ($1 % MB) % MB); print (padded_size / MB) }' "MB=1048576")
 part_uuid_uefi=b0e0359c-007b-4361-a0d1-a7ca2d73fe3c
 echo -e "$part_uuid_uefi\tuefi\t$size_uefi\t0\t$efi_partition\tEFI" >> "$partitions"
@@ -103,4 +103,4 @@ size_rootfs=$(du -b "$root_partition" | awk '{ padded_size = $1 + (MB - ($1 % MB
 part_uuid_rootfs=a9bef950-8218-4888-9f1c-1ad8bb481807
 echo -e "$part_uuid_rootfs\tlinux\t$size_rootfs\t0\t$root_partition\tROOT" >> "$partitions"
 
-makedisk $rootfs_work "$output" < "$partitions"
+makedisk "$rootfs_work" "$output" < "$partitions"
diff --git a/debian/features/ostreeRepo/exec.late b/debian/features/ostreeRepo/exec.late
@@ -23,10 +23,10 @@ declare -A TOPLEVEL_LINKS=(
 
 for link in "${!TOPLEVEL_LINKS[@]}"; do
     target=${TOPLEVEL_LINKS[$link]}
-    echo mv $link $(dirname $target)
-    mv $link $(dirname $target)
-    echo ln -sf $target $link
-    ln -sf $target $link
+    echo mv "$link" $(dirname "$target")
+    mv "$link" $(dirname "$target")
+    echo ln -sf "$target" "$link"
+    ln -sf "$target" "$link"
 done
 
 mv root var/roothome
@@ -91,9 +91,9 @@ fi
 SYSTEMD_ESP_PATH=/boot/efi kernel-install --verbose --entry-token literal:Default add "$version" "$kernel"
 
 # ostree kernel location: https://ostreedev.github.io/ostree/deployment/#contents-of-a-deployment
-mkdir -p /usr/lib/modules/$version/
-cp $kernel /usr/lib/modules/$version/vmlinuz
-cp "/boot/initrd.img-$version" /usr/lib/modules/$version/initramfs.img
+mkdir -p /usr/lib/modules/"$version"/
+cp "$kernel" /usr/lib/modules/"$version"/vmlinuz
+cp "/boot/initrd.img-$version" /usr/lib/modules/"$version"/initramfs.img
 
 # Build fails if we do this here instead of in image.ostree.raw
 # mv /etc /usr/etc

diff --git a/debian/features/ostreeRepo/image.ostreeRepo.tar.gz b/debian/features/ostreeRepo/image.ostreeRepo.tar.gz
@@ -10,9 +10,9 @@ LOCAL_ARCHIVE_PATH=/builder/features/ostreeRepo/$REMOTE_ARCHIVE_NAME
 REMOTE_REPO_PATH=${OS_NAME}-repo-${BUILDER_ARCH}
 LOCAL_ARCHIVE_PATH=/builder/features/ostreeRepo/$REMOTE_ARCHIVE_NAME
 echo Build Configuration:
-echo REMOTE_URL:           $REMOTE_URL
-echo REMOTE_REPO_PATH:     $REMOTE_REPO_PATH
-echo OS_NAME:              $OS_NAME
+echo REMOTE_URL:           "$REMOTE_URL"
+echo REMOTE_REPO_PATH:     "$REMOTE_REPO_PATH"
+echo OS_NAME:              "$OS_NAME"
 
 export PATH="/builder/image.d:$PATH"
 
@@ -35,37 +35,37 @@ tar xf "$rootfs" -C "$rootfs_work"
 
 mv "$rootfs_work"/etc "$rootfs_work"/usr/etc
 
-mkdir -p $OSTREE_REPO
+mkdir -p "$OSTREE_REPO"
 
 download="$(mktemp -d)"
-pushd $download
+pushd "$download"
 
-if [ -f $LOCAL_ARCHIVE_PATH ]; then
+if [ -f "$LOCAL_ARCHIVE_PATH" ]; then
    echo "Using local file from $LOCAL_ARCHIVE_PATH"
-   tar xf $LOCAL_ARCHIVE_PATH --directory $OSTREE_REPO
-elif [ $(curl -sSL --remote-name -w "%{http_code}" $REMOTE_URL/$REMOTE_ARCHIVE_NAME) -eq 200 ]; then
+   tar xf "$LOCAL_ARCHIVE_PATH" --directory "$OSTREE_REPO"
+elif [ $(curl -sSL --remote-name -w "%{http_code}" "$REMOTE_URL"/"$REMOTE_ARCHIVE_NAME") -eq 200 ]; then
    echo "Using remote file from $REMOTE_URL/$REMOTE_ARCHIVE_NAME"
-   tar xf $REMOTE_ARCHIVE_NAME --directory $OSTREE_REPO
+   tar xf "$REMOTE_ARCHIVE_NAME" --directory "$OSTREE_REPO"
 else
     echo "Coud use local file from $LOCAL_ARCHIVE_PATH or remote file from $REMOTE_URL/$REMOTE_ARCHIVE_NAME, building new repo"
-    ostree init --mode=archive --repo=$OSTREE_REPO
-    ostree admin init-fs --modern $OSTREE_SYSROOT
-    ostree admin os-init --sysroot=$OSTREE_SYSROOT ${OS_NAME}
-    ostree config --repo=$OSTREE_REPO set sysroot.bootloader none
+    ostree init --mode=archive --repo="$OSTREE_REPO"
+    ostree admin init-fs --modern "$OSTREE_SYSROOT"
+    ostree admin os-init --sysroot="$OSTREE_SYSROOT" "${OS_NAME}"
+    ostree config --repo="$OSTREE_REPO" set sysroot.bootloader none
 fi
 
 popd
-rm -rf $download
+rm -rf "$download"
 
-ostree remote --repo=$OSTREE_REPO delete --if-exists ${REMOTE_NAME}
-ostree remote --repo=$OSTREE_REPO add --no-gpg-verify --no-sign-verify ${REMOTE_NAME} $REMOTE_URL/$REMOTE_REPO_PATH $OSTREE_REF
+ostree remote --repo="$OSTREE_REPO" delete --if-exists "${REMOTE_NAME}"
+ostree remote --repo="$OSTREE_REPO" add --no-gpg-verify --no-sign-verify "${REMOTE_NAME}" "$REMOTE_URL"/"$REMOTE_REPO_PATH" "$OSTREE_REF"
 
-ostree commit --repo=$OSTREE_REPO --branch $OSTREE_REF --skip-if-unchanged -s "Debian $REMOTE_REPO_PATH $(date --utc +%Y-%m-%dT%H:%M%Z)" "$rootfs_work"
+ostree commit --repo="$OSTREE_REPO" --branch "$OSTREE_REF" --skip-if-unchanged -s "Debian $REMOTE_REPO_PATH $(date --utc +%Y-%m-%dT%H:%M%Z)" "$rootfs_work"
 
-ostree log --repo=$OSTREE_REPO $OSTREE_REF
+ostree log --repo="$OSTREE_REPO" "$OSTREE_REF"
 
-ostree summary --update --repo=$OSTREE_REPO
+ostree summary --update --repo="$OSTREE_REPO"
 
-ostree summary --view --repo=$OSTREE_REPO
+ostree summary --view --repo="$OSTREE_REPO"
 
-tar --directory $OSTREE_REPO --create --mtime="@$BUILDER_TIMESTAMP" --sort name --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime . | gzip > "$output"
+tar --directory "$OSTREE_REPO" --create --mtime="@$BUILDER_TIMESTAMP" --sort name --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime . | gzip > "$output"
diff --git a/gardenlinux/features/ostreeImage/image.ostree.raw b/gardenlinux/features/ostreeImage/image.ostree.raw
@@ -10,9 +10,9 @@ OS_NAME=$([ -f /builder/features/ostreeImage/OS_NAME ] && cat /builder/features/
 REMOTE_ARCHIVE_NAME=ostree-${OS_NAME}-repo-${BUILD_VARIANT}-${BUILDER_ARCH}.tar.gz
 LOCAL_ARCHIVE_PATH=/builder/features/ostreeImage/$REMOTE_ARCHIVE_NAME
 echo Build Configuration:
-echo BUILD_VARIANT: $BUILD_VARIANT
-echo REMOTE_URL:    $REMOTE_URL
-echo OS_NAME:       $OS_NAME
+echo BUILD_VARIANT: "$BUILD_VARIANT"
+echo REMOTE_URL:    "$REMOTE_URL"
+echo OS_NAME:       "$OS_NAME"
 
 export PATH="/builder/image.d:$PATH"
 
@@ -23,7 +23,7 @@ MYROOT="$(mktemp -d)"
 mount -t tmpfs tmpfs "$MYROOT"
 mkdir -p "$MYROOT"/sysroot
 mkdir -p "$MYROOT"/sysroot/ostree/deploy
-mkdir -p "$MYROOT"/sysroot/ostree/deploy/${OS_NAME}/var
+mkdir -p "$MYROOT"/sysroot/ostree/deploy/"${OS_NAME}"/var
 OSTREE_SYSROOT="$MYROOT/sysroot"
 OSTREE_REPO=$OSTREE_SYSROOT/ostree/repo
 OSTREE_REF="${OS_NAME}/today/$BUILDER_ARCH"
@@ -33,58 +33,58 @@ output="$2"
 
 tar xf "$rootfs" -C "$rootfs_work"
 
-mkdir -p $OSTREE_REPO
-mkdir -p $OSTREE_SYSROOT
+mkdir -p "$OSTREE_REPO"
+mkdir -p "$OSTREE_SYSROOT"
 
-if [ -f $LOCAL_ARCHIVE_PATH ]; then
-    echo Found local OSTree repo file at $LOCAL_ARCHIVE_PATH, using it to build the image
-    tar xf $LOCAL_ARCHIVE_PATH --directory $OSTREE_REPO
+if [ -f "$LOCAL_ARCHIVE_PATH" ]; then
+    echo Found local OSTree repo file at "$LOCAL_ARCHIVE_PATH", using it to build the image
+    tar xf "$LOCAL_ARCHIVE_PATH" --directory "$OSTREE_REPO"
 else
     echo Did not find a local OSTree repo file, downloading from remote repo
     download="$(mktemp -d)"
-    pushd $download
-    curl -fsSL --remote-name $REMOTE_URL/$REMOTE_ARCHIVE_NAME
-    tar xf $REMOTE_ARCHIVE_NAME --directory $OSTREE_REPO
-    ls -l $OSTREE_REPO
+    pushd "$download"
+    curl -fsSL --remote-name "$REMOTE_URL"/"$REMOTE_ARCHIVE_NAME"
+    tar xf "$REMOTE_ARCHIVE_NAME" --directory "$OSTREE_REPO"
+    ls -l "$OSTREE_REPO"
     popd
-    rm -rf $download
+    rm -rf "$download"
 fi
 
-ostree admin deploy --karg=root=LABEL=ROOT --karg-append=rw --karg-append=efi=runtime --sysroot=$OSTREE_SYSROOT --os=${OS_NAME} $OSTREE_REF
+ostree admin deploy --karg=root=LABEL=ROOT --karg-append=rw --karg-append=efi=runtime --sysroot="$OSTREE_SYSROOT" --os="${OS_NAME}" "$OSTREE_REF"
 
-boot_hash=`ls "$OSTREE_SYSROOT"/ostree/boot.1.1/${OS_NAME}/`
-mkdir -p "$OSTREE_SYSROOT"/ostree/boot.1.1/${OS_NAME}/$boot_hash/0/sysroot
+boot_hash=$(ls "$OSTREE_SYSROOT"/ostree/boot.1.1/"${OS_NAME}"/)
+mkdir -p "$OSTREE_SYSROOT"/ostree/boot.1.1/"${OS_NAME}"/"$boot_hash"/0/sysroot
 
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/home
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/roothome
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/opt
-mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/${OS_NAME}/var/srv
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/home
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/roothome
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/opt
+mkdir -p "$OSTREE_SYSROOT"/ostree/deploy/"${OS_NAME}"/var/srv
 
 # Build disk image, this is hacky as of now, needs rework
 # Setup bootloader
 boot_dir=$(mktemp -d)
-cp -r $OSTREE_SYSROOT/boot/* $boot_dir
+cp -r "$OSTREE_SYSROOT"/boot/* "$boot_dir"
 LOADER_TEMP=$(mktemp -d)
-echo BOOT_DIR: $boot_dir
-ls -la $boot_dir
-rm -rf $boot_dir/loader
+echo BOOT_DIR: "$boot_dir"
+ls -la "$boot_dir"
+rm -rf "$boot_dir"/loader
 # move to temp dir to avoid errors with systemd-boot install
-mv $boot_dir/loader.1 $LOADER_TEMP
-mkdir -p $rootfs_work/boot/efi
-mount --bind $boot_dir $rootfs_work/boot/efi
-mount --rbind /proc $rootfs_work/proc
-mount --rbind /sys $rootfs_work/sys
-ls -l $rootfs_work/usr/bin
-SYSTEMD_ESP_PATH=/boot/efi chroot $rootfs_work /usr/bin/bootctl --no-variables install
-umount -l $rootfs_work/proc
-umount -l $rootfs_work/sys
-umount $rootfs_work/boot/efi
+mv "$boot_dir"/loader.1 "$LOADER_TEMP"
+mkdir -p "$rootfs_work"/boot/efi
+mount --bind "$boot_dir" "$rootfs_work"/boot/efi
+mount --rbind /proc "$rootfs_work"/proc
+mount --rbind /sys "$rootfs_work"/sys
+ls -l "$rootfs_work"/usr/bin
+SYSTEMD_ESP_PATH=/boot/efi chroot "$rootfs_work" /usr/bin/bootctl --no-variables install
+umount -l "$rootfs_work"/proc
+umount -l "$rootfs_work"/sys
+umount "$rootfs_work"/boot/efi
 # recover from temp dir
-cp -r $LOADER_TEMP/* $boot_dir/loader.1
-cp -r $LOADER_TEMP/* $boot_dir/loader
-cp $boot_dir/loader/loader.1/entries/* $boot_dir/loader/entries
-cat $boot_dir/loader/entries/*
-echo 'timeout 7' > $boot_dir/loader/loader.conf
+cp -r "$LOADER_TEMP"/* "$boot_dir"/loader.1
+cp -r "$LOADER_TEMP"/* "$boot_dir"/loader
+cp "$boot_dir"/loader/loader.1/entries/* "$boot_dir"/loader/entries
+cat "$boot_dir"/loader/entries/*
+echo 'timeout 7' > "$boot_dir"/loader/loader.conf
 
 efi_partition=$(mktemp)
 root_partition=$(mktemp)
@@ -93,7 +93,7 @@ partitions=$(mktemp)
 # fixme: make disk size dynamic
 truncate -s 500M "$efi_partition"
 # make_reproducible_vfat $OSTREE_SYSROOT/boot "$efi_partition"
-make_reproducible_vfat -t 11111111 $boot_dir "$efi_partition"
+make_reproducible_vfat -t 11111111 "$boot_dir" "$efi_partition"
 size_uefi=$(du -b "$efi_partition" | awk '{ padded_size = $1 + (MB - ($1 % MB) % MB); print (padded_size / MB) }' "MB=1048576")
 part_uuid_uefi=b0e0359c-007b-4361-a0d1-a7ca2d73fe3c
 echo -e "$part_uuid_uefi\tuefi\t$size_uefi\t0\t$efi_partition\tEFI" >> "$partitions"
@@ -104,4 +104,4 @@ size_rootfs=$(du -b "$root_partition" | awk '{ padded_size = $1 + (MB - ($1 % MB
 part_uuid_rootfs=a9bef950-8218-4888-9f1c-1ad8bb481807
 echo -e "$part_uuid_rootfs\tlinux\t$size_rootfs\t0\t$root_partition\tROOT" >> "$partitions"
 
-makedisk $rootfs_work "$output" < "$partitions"
+makedisk "$rootfs_work" "$output" < "$partitions"
diff --git a/gardenlinux/features/ostreeRepo/exec.late b/gardenlinux/features/ostreeRepo/exec.late
@@ -23,10 +23,10 @@ declare -A TOPLEVEL_LINKS=(
 
 for link in "${!TOPLEVEL_LINKS[@]}"; do
     target=${TOPLEVEL_LINKS[$link]}
-    echo mv $link $(dirname $target)
-    mv $link $(dirname $target)
-    echo ln -sf $target $link
-    ln -sf $target $link
+    echo mv "$link" $(dirname "$target")
+    mv "$link" $(dirname "$target")
+    echo ln -sf "$target" "$link"
+    ln -sf "$target" "$link"
 done
 
 mv root var/roothome
@@ -110,9 +110,9 @@ rm /usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service
 rm /usr/lib/systemd/system/systemd-repart.service
 
 # ostree kernel location: https://ostreedev.github.io/ostree/deployment/#contents-of-a-deployment
-mkdir -p /usr/lib/modules/$version/
-cp $kernel /usr/lib/modules/$version/vmlinuz
-cp "/boot/initrd.img-$version" /usr/lib/modules/$version/initramfs.img
+mkdir -p /usr/lib/modules/"$version"/
+cp "$kernel" /usr/lib/modules/"$version"/vmlinuz
+cp "/boot/initrd.img-$version" /usr/lib/modules/"$version"/initramfs.img
 
 # Build fails if we do this here instead of in image.ostree.raw
 # mv /etc /usr/etc