From f46a0c684164b454a70402c5e7286a1b13709f26 Mon Sep 17 00:00:00 2001 From: Raphael Numbus Date: Sun, 14 Dec 2025 16:07:13 +0100 Subject: [PATCH] DEBUGGING --- deploy.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/deploy.sh b/deploy.sh index ba487a6..b8ac4e8 100755 --- a/deploy.sh +++ b/deploy.sh @@ -79,7 +79,8 @@ setup_ssh() { } ssh_to_host() { - ssh -i "extra-files/home/numbus-admin/.ssh/id_ed25519" "nixos@$TARGET_HOST" "$1" + ARG="$1" + ssh -i "extra-files/home/numbus-admin/.ssh/id_ed25519" "nixos@$TARGET_HOST" $ARG } hardware_detection() { @@ -251,7 +252,6 @@ files_generation() { cp -ravu ./nix-config/* extra-files/etc/nixos/ } -disk_config_generation() { ### --> Disk wiping warning gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 " ⚠️ $(gum style --foreground 212 'WARNING:') You will choose the disks to install NixOS on. @@ -265,7 +265,7 @@ disk_config_generation() { ### Disk wiping warning <-- ### --> Get disk information - DISK_DETAILS=$(ssh_to_host " + DISK_DETAILS=$(ssh nixos@192.168.11.115 " # Declare arrays and variables HDD=1 @@ -329,20 +329,19 @@ echo \"\${DISK_SIZE[@]}\" HEADER=$(printf " %-12s %-12s %-12s %-12s %s" "Device" "Type" "Size" "SMART" "Path") for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do - GUM_PRINTED_ELEMENT=$(printf "%-12s %-12s %-12s %-12s %s" \ - "${DISK_NAME[$i]}" "${DISK_TYPE[$i]}" "${DISK_SIZE[$i]}" \ - "${DISK_HEALTH[$i]}" "${DISK_DEVPATH[$i]}") - GUM_PRINTED_ELEMENTS+=("$GUM_PRINTED_ELEMENT") + GUM_PRINTED_ELEMENT=$(printf "%-12s %-12s %-12s %-12s %s" \ + "${DISK_NAME[$i]}" "${DISK_TYPE[$i]}" "${DISK_SIZE[$i]}" \ + "${DISK_HEALTH[$i]}" "${DISK_DEVPATH[$i]}") + GUM_PRINTED_ELEMENTS+=("$GUM_PRINTED_ELEMENT") done gum style --foreground 212 " ➡️ Please choose one (stripe) or two (mirror) disks for your NixOS boot installation :" SELECTED_BOOT_DISK=$(gum choose --limit 2 --header "$HEADER" "${GUM_PRINTED_ELEMENTS[@]}") -NUMBER_OF_BOOT_DISKS=0 for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do if printf '%s' "$SELECTED_BOOT_DISK" | grep -iq "${DISK_NAME[$i]}"; then - NUMBER_OF_BOOT_DISKS=$(($NUMBER_OF_BOOT_DISKS + 1)) + ((NUMBER_OF_BOOT_DISKS++)) export "BOOT_DISK_${NUMBER_OF_BOOT_DISKS}_ID=${DISK_ID[$i]}" unset "GUM_PRINTED_ELEMENTS[${i}]" fi @@ -362,10 +361,9 @@ NUMBER_OF_BOOT_DISKS=0 SELECTED_DATA_DISK=$(gum choose --limit 9 --header "$HEADER" "${GUM_PRINTED_ELEMENTS[@]}") -NUMBER_OF_DATA_DISKS=0 for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do if printf '%s' "$SELECTED_DATA_DISK" | grep -iq "${DISK_NAME[$i]}"; then - NUMBER_OF_DATA_DISKS=$(($NUMBER_OF_DATA_DISKS + 1)) + ((NUMBER_OF_DATA_DISKS++)) fi done @@ -398,8 +396,8 @@ NUMBER_OF_DATA_DISKS=0 fi done else - NUMBER_OF_PARITY_DISKS=$((($NUMBER_OF_DATA_DISKS + 2) / 3)) - NUMBER_OF_CONTENT_DISKS=$(($NUMBER_OF_DATA_DISKS - $NUMBER_OF_PARITY_DISKS)) + NUMBER_OF_PARITY_DISKS=$(((NUMBER_OF_DATA_DISKS + 2) / 3)) + NUMBER_OF_CONTENT_DISKS=$((NUMBER_OF_DATA_DISKS - NUMBER_OF_PARITY_DISKS)) j="$NUMBER_OF_PARITY_DISKS" k="$NUMBER_OF_CONTENT_DISKS" l="1" @@ -420,6 +418,11 @@ NUMBER_OF_DATA_DISKS=0 fi done fi + + echo "BOOT : $NUMBER_OF_BOOT_DISKS" + echo "CONTENT : $NUMBER_OF_CONTENT_DISKS" + echo "PARITY : $NUMBER_OF_PARITY_DISKS" + echo $TOTAL_NUMBER_OF_DISKS ### Disk selection <-- ### --> Selection recap