From de666d44c8c07dfcabba3b28237fe0629f1d1621 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 18 Nov 2024 22:32:20 -0600
Subject: [PATCH] Fix shellcheck

---
 flake.nix           | 16 ++++++----------
 scripts/minimize.sh | 13 +++++++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index b8e109f..2eb2632 100644
--- a/flake.nix
+++ b/flake.nix
@@ -150,18 +150,14 @@
               builds = lib.lists.foldr (d: acc: acc // { "build${name d}" = (build d); }) { } withProviders;
               uploads = lib.lists.foldr (d: acc: acc // { "upload${name d}" = (upload d); }) { } withProviders;
               cibuilds = lib.lists.foldr (d: acc: acc // { "ci${name d}" = (cibuild d); }) { } withProviders;
-              qemu_list = builtins.toJSON (
-                builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "qemu") active)
+              qemu_list = builtins.map (d: { buildcmd = (name d); }) (
+                builtins.filter (x: x.provider == "qemu") active
               );
-              vbox_list = builtins.toJSON (
-                builtins.map (d: { buildcmd = (name d); }) (
-                  builtins.filter (x: x.provider == "virtualbox-iso") active
-                )
+              vbox_list = builtins.map (d: { buildcmd = (name d); }) (
+                builtins.filter (x: x.provider == "virtualbox-iso") active
               );
-              hyperv_list = builtins.toJSON (
-                builtins.map (d: { distro = distroFile d; }) (
-                  builtins.filter (x: x.provider == "hyperv-iso") active
-                )
+              hyperv_list = builtins.map (d: { distro = distroFile d; }) (
+                builtins.filter (x: x.provider == "hyperv-iso") active
               );
             in
             builds
diff --git a/scripts/minimize.sh b/scripts/minimize.sh
index 61a618d..7cc22f0 100644
--- a/scripts/minimize.sh
+++ b/scripts/minimize.sh
@@ -21,10 +21,15 @@ elif [ -n "$swap_device_label" ]; then
 	swap_device=$(readlink -f /dev/disk/by-label/"$swap_device_label")
 fi
 
-if [ -n "${swap_device}" ] && [ -e "${swap_device}" ] && [ "${swap_device}" != "/dev/zram"* ]; then
-	sudo /sbin/swapoff "$swap_device"
-	sudo dd if=/dev/zero of="$swap_device" bs=1M || :
-	sudo /sbin/mkswap ${swap_device_label:+-L "$swap_device_label"} ${swap_device_uuid:+-U "$swap_device_uuid"} "$swap_device"
+if [ -n "${swap_device}" ] && [ -e "${swap_device}" ]; then
+	case ${swap_device} in
+		"/dev/zram"*) ;;
+		*)
+			sudo /sbin/swapoff "$swap_device"
+			sudo dd if=/dev/zero of="$swap_device" bs=1M || :
+			sudo /sbin/mkswap ${swap_device_label:+-L "$swap_device_label"} ${swap_device_uuid:+-U "$swap_device_uuid"} "$swap_device"
+			;;
+	esac
 fi
 
 sleep 15  # Hyper-v seems to be super fast during boot