greg/vms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix shellcheck

Browse Source
This commit is contained in:
Greg Hellings
2024-11-18 22:39:41 -06:00
parent 1b8a742563
commit de666d44c8
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+6 -10
View File
@@ -150,18 +150,14 @@
builds = lib.lists.foldr (d: acc: acc // { "build${name d}" = (build d); }) { } withProviders; 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; 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; cibuilds = lib.lists.foldr (d: acc: acc // { "ci${name d}" = (cibuild d); }) { } withProviders;
qemu_list = builtins.toJSON ( qemu_list = builtins.map (d: { buildcmd = (name d); }) (
builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "qemu") active) builtins.filter (x: x.provider == "qemu") active
); );
vbox_list = builtins.toJSON ( vbox_list = builtins.map (d: { buildcmd = (name d); }) (
builtins.map (d: { buildcmd = (name d); }) ( builtins.filter (x: x.provider == "virtualbox-iso") active
builtins.filter (x: x.provider == "virtualbox-iso") active
)
); );
hyperv_list = builtins.toJSON ( hyperv_list = builtins.map (d: { distro = distroFile d; }) (
builtins.map (d: { distro = distroFile d; }) ( builtins.filter (x: x.provider == "hyperv-iso") active
builtins.filter (x: x.provider == "hyperv-iso") active
)
); );
in in
builds builds
scripts/minimize.sh
+9 -4
View File
@@ -21,10 +21,15 @@ elif [ -n "$swap_device_label" ]; then
swap_device=$(readlink -f /dev/disk/by-label/"$swap_device_label") swap_device=$(readlink -f /dev/disk/by-label/"$swap_device_label")
fi fi
if [ -n "${swap_device}" ] && [ -e "${swap_device}" ] && [ "${swap_device}" != "/dev/zram"* ]; then if [ -n "${swap_device}" ] && [ -e "${swap_device}" ]; then
sudo /sbin/swapoff "$swap_device" case ${swap_device} in
sudo dd if=/dev/zero of="$swap_device" bs=1M || : "/dev/zram"*) ;;
sudo /sbin/mkswap ${swap_device_label:+-L "$swap_device_label"} ${swap_device_uuid:+-U "$swap_device_uuid"} "$swap_device" *)
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 fi
sleep 15 # Hyper-v seems to be super fast during boot sleep 15 # Hyper-v seems to be super fast during boot