From 508f70b7f66d5da17c8381545f5b67894fcbd576 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 19 Feb 2023 23:45:08 +0100
Subject: Fix(bootstrap): Fix nasty grep bug

---
 bootstrap/default.nix |   2 +-
 bootstrap/install     | 127 --------------------------------------------------
 bootstrap/install.old |  65 --------------------------
 bootstrap/install.sh  | 126 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+), 193 deletions(-)
 delete mode 100755 bootstrap/install
 delete mode 100755 bootstrap/install.old
 create mode 100755 bootstrap/install.sh

diff --git a/bootstrap/default.nix b/bootstrap/default.nix
index 8cd7b394..6fab9a2d 100644
--- a/bootstrap/default.nix
+++ b/bootstrap/default.nix
@@ -6,7 +6,7 @@
 }: let
   dependencies = with pkgs; [jq dash];
   name = "install";
-  script = ./install;
+  script = ./install.sh;
   lib = import ../lib {inherit pkgs shell-library;};
 in
   lib.makeShellScriptWithLibrary {inherit dependencies name script;}
diff --git a/bootstrap/install b/bootstrap/install
deleted file mode 100755
index 81829019..00000000
--- a/bootstrap/install
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
-export LIB_TEMP_DIR_FOR_SCRIPT="$(mktemp -d)"
-bsc() {
-    msg2 "$(btrfs subvolume create "$1" || dien "Creating of subvol $1")";
-}
-
-mne() {
-    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;
-
-
-[ "$(jq '.[]' "$available_disks" | wc -l)" -eq 0 ] && die "No disks found"
-msg "Select a disk to format:\n"
-
-i=9999; # nobody will have so many disks attached
-
-while ! jq -e --argjson i "$i" '.[$i]' "$available_disks" > /dev/null 2>&1; do
-    for disk in $(jq -c '.[]' "$available_disks" ); do
-        printf "%4s) %s \n" "$(echo "$disk" | jq '.index')" "$(echo "$disk" | jq '.item' | tr -d "\"")";
-    done
-    printf "%4s) Exit\n" "q"
-    readp  "Enter a option: " disk
-
-    if [ $disk = "q" ];then
-        exit 1
-    else
-        i="$disk"
-    fi
-    if jq -e --argjson i "$i" 'nth($i)' "$available_disks"  > /dev/null 2>&1; then
-        disk=$(mktmp);
-        jq -e --argjson i "$i" 'nth($i)' "$available_disks" > "$disk";
-    else
-        warning "No disk selected. Select a disk to continue.\n"
-    fi
-done
-
-readp "Do you really want to delete all data on disk $(jq '.item' "$disk")? [N/y]: " result
-case $result in
-    [Yy])
-        msg "Great, deleting everything..."
-        disk="$(jq '.item' "$disk" | tr -d "\"")"
-        ;;
-    *)
-        msg "Sure, keep your data"
-        exit 1
-        ;;
-esac
-
-sgdisk -Z "/dev/${disk}" > /dev/null|| dien "Zapping"
-
-sgdisk -n 1:0:+550M -n 2:0:"$ENDSECTOR" -t 1:ef00 -t 2:8300 "/dev/${disk}" > /dev/null|| dien "Partitioning"
-
-case "$disk" in
-    "nvme"*)
-        export DISK_EFI="/dev/${disk}"p1
-        export DISK_ROOT="/dev/${disk}"p2
-        ;;
-    "sd"* |"vd"*)
-        export DISK_EFI="/dev/${disk}"1
-        export DISK_ROOT="/dev/${disk}"2
-        ;;
-    *)
-        die "The disk type: ${disk} is not yet supported!"
-        ;;
-esac
-
-msg "Started Formatting..."
-mkfs.fat -F32 "$DISK_EFI" > /dev/null || dien "Formatting(fat32)"
-mkfs.btrfs -f "$DISK_ROOT" > /dev/null || dien "Formatting(btrfs)"
-
-
-msg "Mounting..."
-mount -t btrfs $DISK_ROOT /mnt
-cd /mnt || die "(Bug): no /mnt"
-bsc nix-store
-bsc persistent-storage
-bsc persistent-storage/nixos-config
-cd /
-umount -R /mnt
-mount -t tmpfs none /mnt
-mount --mkdir "$DISK_EFI" /mnt/boot
-
-mne nix-store /mnt/nix
-mne persistent-storage /mnt/srv
-
-mount --mkdir --options bind /mnt/srv/nixos-config /mnt/etc/nixos
-
-msg "Finished mounting and generating btrfs subvolumes"
-readp "Do you want to continue with nixos-install? [N/y]: " result
-case $result in
-    [Yy])
-        msg "Great, select a host-config:"
-        hosts=$(mktmp);
-        host="";
-        awk -F "." '/nixosConfiguration/{print $2}' "$(tmp 'curl https://git.sils.li/ene/nixos-config/raw/branch/prime/flake.nix')" | awk '{print $1}' > $hosts;
-
-        while ! grep "$host" "$hosts" > /dev/null && [ "$host" == "" ]; do
-            i=1;
-            while read -r ho ; do
-                printf "%4s) %s \n" "$i" "$ho";
-                i=$((i+1));
-            done < "$hosts"
-            printf "%4s) Exit\n" "q"
-            readp  "Enter a option: " host
-
-            [ $host = "q" ] && exit 1
-            if grep "$host" "$hosts" > /dev/null && [ "$host" != "" ]; then
-                host=$(awk -v i="$host" '{if (NR==i) {print $0}}' "$hosts");
-            else
-                warning "No host selected. Select a host to continue.\n"
-            fi
-        done
-        nixos-install --flake git+https://git.sils.li/ene/nixos-config#${host} --no-root-passwd
-        ;;
-    *)
-        msg "Sure, do it yourself"
-        exit 1
-        ;;
-esac
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
diff --git a/bootstrap/install.old b/bootstrap/install.old
deleted file mode 100755
index 013a1287..00000000
--- a/bootstrap/install.old
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-. ~/.local/lib/shell/lib
-
-#After partitioning /dev/vda1 as efi and /dev/vda2 as btrfs, installation is as simple as:
-
-available_disks="$(mktmp)";
-lsblk -J | jq '.[] | map(.name) | [foreach .[] as $item ({item: null, index: -1}; {$item, index: (.index + 1)})]' > $available_disks;
-#"$(lsblk -J | jq '.[]| .[]| {name: .name, children: (.children | map(.name))} | .name')"
-
-
-[ "$(jq '.[]' "$available_disks" | wc -l)" -eq 0 ] && die "No disks found"
-msg "Select a disk to format:\n"
-
-i=9999; # nobody will have so many disks attached
-
-while ! jq -e --argjson i "$i" '.[$i]' "$available_disks" > /dev/null ; do
-    for disk in $(jq -c '.[]' "$available_disks" ); do
-        printf "%4s) %s \n" "$(echo "$disk" | jq '.index')" "$(echo "$disk" | jq '.item' | tr -d "\"")";
-    done
-    printf "%4s) Exit\n" "q"
-    readp  "Enter a option: " disk
-
-    if [ $disk = "q" ];then
-        exit 1
-    else
-        i="$disk"
-    fi
-    jq -e --argjson i "$i" '.[$i]' "$available_disks" || warning "\nNo disk selected. Select a disk to continue.\n"
-done
-
-exit 0;
-#disk=$((disk-1))
-#read -p "Do you want to delete all in ${Disk_Array[$disk]}? [N/y]" -n 1 -r result
-#[[ $result =~ ^[Yy]$ ]] && echo || exit 1
-#sgdisk -Z "${Disk_Array[$disk]}" > /dev/null || dien "Zapping"
-#sgdisk -n 1:0:+300M -n 2:0:"$ENDSECTOR" -t 1:ef00 -t 2:8300 "${Disk_Array[$disk]}" > /dev/null || dien "Partitioning"
-#
-#if [[ ${Disk_Array[$disk]} == *"nvme"* ]];then
-#    export DISK_EFI=${Disk_Array[$disk]}p1 && echo "${Disk_Array[$disk]}p1" > /root/efi-disk
-#    export DISK_ROOT=${Disk_Array[$disk]}p2 && echo "${Disk_Array[$disk]}p2" > /root/root-disk
-#else
-#    export DISK_EFI=${Disk_Array[$disk]}1 && echo "${Disk_Array[$disk]}1" > /root/efi-disk
-#    export DISK_ROOT=${Disk_Array[$disk]}2 && echo "${Disk_Array[$disk]}2" > /root/root-disk
-#fi
-#
-#
-#mount -t btrfs /dev/vda2 /mnt
-#btrfs subvolume create /mnt/{nix,storage}
-#btrfs subvolume create /mnt/storage/{networkmanager,nixos-server}
-#umount /mnt
-#mount -t tmpfs none /mnt
-#mkdir -p /mnt/{nix,etc/nixos,etc/NetworkManager,srv,boot}
-#mount /dev/vda1 /mnt/boot
-#mount -t btrfs -o subvol=nix /dev/vda2 /mnt/nix
-#mount -t btrfs -o subvol=storage /dev/vda2 /mnt/srv
-#mount -o bind /mnt/srv/nixos-server /mnt/etc/nixos
-#mount -o bind /mnt/srv/networkmanager /mnt/etc/NetworkManager
-#nixos-generate-config --root /mnt
-#nixos-install --no-root-passwd
-#reboot
-#
-#
-#if [ -d /tmp/LIB_FILE_TEMP_DIR/ ];then rm -r /tmp/LIB_FILE_TEMP_DIR/; fi
diff --git a/bootstrap/install.sh b/bootstrap/install.sh
new file mode 100755
index 00000000..37a5e758
--- /dev/null
+++ b/bootstrap/install.sh
@@ -0,0 +1,126 @@
+#! /usr/bin/env dash
+# shellcheck disable=SC2086
+# shellcheck source=/dev/null
+. %SHELL_LIBRARY_PATH
+export LIB_TEMP_DIR_FOR_SCRIPT="$(mktemp -d)"
+bsc() {
+    msg2 "$(btrfs subvolume create "$1" || dien "Creating of subvol $1")";
+}
+
+mne() {
+    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;
+
+
+[ "$(jq '.[]' "$available_disks" | wc -l)" -eq 0 ] && die "No disks found"
+msg "Select a disk to format:\n"
+
+i=9999; # nobody will have so many disks attached
+
+while ! jq -e --argjson i "$i" '.[$i]' "$available_disks" > /dev/null 2>&1; do
+    for disk in $(jq -c '.[]' "$available_disks" ); do
+        printf "%4s) %s \n" "$(echo "$disk" | jq '.index')" "$(echo "$disk" | jq '.item' | tr -d "\"")";
+    done
+    printf "%4s) Exit\n" "q"
+    readp  "Enter a option: " disk
+
+    if [ $disk = "q" ];then
+        exit 1
+    else
+        i="$disk"
+    fi
+    if jq -e --argjson i "$i" 'nth($i)' "$available_disks"  > /dev/null 2>&1; then
+        disk=$(mktmp);
+        jq -e --argjson i "$i" 'nth($i)' "$available_disks" > "$disk";
+    else
+        warning "No disk selected. Select a disk to continue.\n"
+    fi
+done
+
+readp "Do you really want to delete all data on disk $(jq '.item' "$disk")? [N/y]: " result
+case $result in
+    [Yy])
+        msg "Great, deleting everything..."
+        disk="$(jq '.item' "$disk" | tr -d "\"")"
+        ;;
+    *)
+        msg "Sure, keep your data"
+        exit 1
+        ;;
+esac
+
+sgdisk -Z "/dev/${disk}" > /dev/null|| dien "Zapping"
+
+sgdisk -n 1:0:+550M -n 2:0:"$ENDSECTOR" -t 1:ef00 -t 2:8300 "/dev/${disk}" > /dev/null|| dien "Partitioning"
+
+case "$disk" in
+    "nvme"*)
+        export DISK_EFI="/dev/${disk}"p1
+        export DISK_ROOT="/dev/${disk}"p2
+        ;;
+    "sd"* |"vd"*)
+        export DISK_EFI="/dev/${disk}"1
+        export DISK_ROOT="/dev/${disk}"2
+        ;;
+    *)
+        die "The disk type: ${disk} is not yet supported!"
+        ;;
+esac
+
+msg "Started Formatting..."
+mkfs.fat -F32 "$DISK_EFI" > /dev/null || dien "Formatting(fat32)"
+mkfs.btrfs -f "$DISK_ROOT" > /dev/null || dien "Formatting(btrfs)"
+
+
+msg "Mounting..."
+mount -t btrfs $DISK_ROOT /mnt
+cd /mnt || die "(Bug): no /mnt"
+bsc nix-store
+bsc persistent-storage
+bsc persistent-storage/nixos-config
+cd /
+umount -R /mnt
+mount -t tmpfs none /mnt
+mount --mkdir "$DISK_EFI" /mnt/boot
+
+mne nix-store /mnt/nix
+mne persistent-storage /mnt/srv
+
+mount --mkdir --options bind /mnt/srv/nixos-config /mnt/etc/nixos
+
+msg "Finished mounting and generating btrfs subvolumes"
+readp "Do you want to continue with nixos-install? [N/y]: " result
+case $result in
+    [Yy])
+        msg "Great, select a host-config:"
+        hosts=$(mktmp);
+        host="";
+        awk -F "." '/nixosConfiguration/{print $2}' "$(tmp 'curl https://git.sils.li/ene/nixos-config/raw/branch/prime/flake.nix 2> /dev/null')" | awk '{print $1}' > $hosts;
+
+        while ! grep "$host" "$hosts" > /dev/null || [ "$(printf "%s" "$host" | wc -c)" -eq 0 ]; do
+            i=1;
+            while read -r ho ; do
+                printf "%4s) %s \n" "$i" "$ho";
+                i=$((i+1));
+            done < "$hosts"
+            printf "%4s) Exit\n" "q"
+            readp  "Enter a option: " host
+
+            [ "$host" = "q" ] && exit 1
+            host=$(awk -v i="$host" '{if (NR==i) {print $0}}' "$hosts");
+            if ! grep "$host" "$hosts" > /dev/null || [ "$(printf "%s" "$host" | wc -c)" -eq 0 ]; then
+                warning "No host selected. Select a host to continue.\n"
+            fi
+        done
+        nixos-install --flake git+https://git.sils.li/ene/nixos-config#${host} --no-root-passwd
+        ;;
+    *)
+        msg "Sure, do it yourself"
+        exit 1
+        ;;
+esac
+if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
-- 
cgit 1.4.1