From 1f79cb3c844a4e03ad0bf2f8f18518d437caaa27 Mon Sep 17 00:00:00 2001 From: Soispha Date: Sun, 28 May 2023 22:09:21 +0200 Subject: Fix(bootstrap): Quote scripts --- bootstrap/activate/activate.sh | 4 ++-- bootstrap/setup/setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap/activate/activate.sh b/bootstrap/activate/activate.sh index d34a2826..5dc13ea5 100755 --- a/bootstrap/activate/activate.sh +++ b/bootstrap/activate/activate.sh @@ -4,12 +4,12 @@ SHELL_LIBRARY_VERSION="1.1.3" . %SHELL_LIBRARY_PATH mne() { - mount --mkdir --options compress-force=zstd:15,subvol="$1" $DISK_ROOT "$2" || dien "Mounting of $1"; + mount --mkdir --options compress-force=zstd:15,subvol="$1" "$DISK_ROOT" "$2" || dien "Mounting of $1"; } available_disks="$(mktmp)"; -lsblk -J | jq '.[] | map(.name) | [foreach .[] as $item ({item: null, index: -1}; {$item, index: (.index + 1)})]' > $available_disks; +lsblk -J | jq '.[] | map(.name) | [foreach .[] as $item ({item: null, index: -1}; {$item, index: (.index + 1)})]' > "$available_disks"; [ "$(jq '.[]' "$available_disks" | wc -l)" -eq 0 ] && die "No disks found" diff --git a/bootstrap/setup/setup.sh b/bootstrap/setup/setup.sh index 803123e3..bc171303 100755 --- a/bootstrap/setup/setup.sh +++ b/bootstrap/setup/setup.sh @@ -6,7 +6,7 @@ msg "Select a host-config:" hosts=$(mktmp); host=""; -curl https://codeberg.org/soispha/nixos-config/raw/branch/prime/flake/nixosConfigurations/default.nix 2> /dev/null | awk -F '"' '/hosts = /{for (i=2;i $hosts; +curl https://codeberg.org/soispha/nixos-config/raw/branch/prime/flake/nixosConfigurations/default.nix 2> /dev/null | awk -F '"' '/hosts = /{for (i=2;i "$hosts"; while ! grep "$host" "$hosts" > /dev/null || [ "$(printf "%s" "$host" | wc -c)" -eq 0 ]; do i=1; -- cgit 1.4.1