diff --git a/deploy.sh b/deploy.sh index e8cf145..d7d2fef 100644 --- a/deploy.sh +++ b/deploy.sh @@ -689,19 +689,21 @@ export_configuration() { cp -avu templates/post-install/numbus-server.sh "$CONFIG_EXPORT_DIR" - echo "export TARGET_INTERFACE=${TARGET_INTERFACE}" >> $CONFIG_EXPORT_FILE - echo -e "\n# DISK SETTINGS" >> $CONFIG_EXPORT_FILE - echo "export BOOT_DISKS_ID=(${BOOT_DISKS_ID[@]})" >> $CONFIG_EXPORT_FILE - echo "export DATA_DISKS_ID=(${DATA_DISKS_ID[@]})" >> $CONFIG_EXPORT_FILE - echo "export DATA_DISKS_TYPE=(${DATA_DISKS_TYPE[@]})" >> $CONFIG_EXPORT_FILE - echo "export SPINDOWN_DISKS_ID=(${SPINDOWN_DISKS_ID[@]})" >> $CONFIG_EXPORT_FILE - echo "export CONTENT_DISK_NUMBER=${CONTENT_DISK_NUMBER}" >> $CONFIG_EXPORT_FILE - echo "export PARITY_DISK_NUMBER=${PARITY_DISK_NUMBER}" >> $CONFIG_EXPORT_FILE - echo -e "\n# TPM SETTINGS" >> $CONFIG_EXPORT_FILE - echo "export TARGET_TPM=${TARGET_TPM}" >> $CONFIG_EXPORT_FILE - echo "export TARGET_TPM_VERSION=${TARGET_TPM_VERSION:-}" >> $CONFIG_EXPORT_FILE - echo -e "\n# Podman SETTINGS" >> $CONFIG_EXPORT_FILE - echo "export PODMAN_NETWORKS=${PODMAN_NETWORKS}" >> $CONFIG_EXPORT_FILE + echo "export TARGET_INTERFACE=\"${TARGET_INTERFACE}\"" >> $CONFIG_EXPORT_FILE + echo -e "\n# DISK SETTINGS" >> $CONFIG_EXPORT_FILE + echo "export BOOT_DISKS_ID=\"(${BOOT_DISKS_ID[@]})\"" >> $CONFIG_EXPORT_FILE + echo "export DATA_DISKS_ID=\"(${DATA_DISKS_ID[@]})\"" >> $CONFIG_EXPORT_FILE + echo "export DATA_DISKS_TYPE=\"(${DATA_DISKS_TYPE[@]})\"" >> $CONFIG_EXPORT_FILE + echo "export SPINDOWN_DISKS_ID=\"(${SPINDOWN_DISKS_ID[@]})\"" >> $CONFIG_EXPORT_FILE + echo "export CONTENT_DISK_NUMBER=\"${CONTENT_DISK_NUMBER}\"" >> $CONFIG_EXPORT_FILE + echo "export PARITY_DISK_NUMBER=\"${PARITY_DISK_NUMBER}\"" >> $CONFIG_EXPORT_FILE + echo -e "\n# TPM SETTINGS" >> $CONFIG_EXPORT_FILE + echo "export TARGET_TPM=\"${TARGET_TPM}\"" >> $CONFIG_EXPORT_FILE + echo "export TARGET_TPM_VERSION=\"${TARGET_TPM_VERSION:-}\"" >> $CONFIG_EXPORT_FILE + echo -e "\n# Podman SETTINGS" >> $CONFIG_EXPORT_FILE + echo "export PODMAN_NETWORKS=\"${PODMAN_NETWORKS}\"" >> $CONFIG_EXPORT_FILE + echo "export TRAEFIK_NETWORKS=\"${TRAEFIK_NETWORKS}\"" >> $CONFIG_EXPORT_FILE + echo "export TRAEFIK_REF_NETWORKS=\"${TRAEFIK_REF_NETWORKS}\"" >> $CONFIG_EXPORT_FILE } deploy() { @@ -727,14 +729,13 @@ postrun_action() { gum spin --title "Rebooting the remote..." -- sleep 120 - gum confirm "➡️ Select 'yes' once the machine rebooted and you unlocked the disks." || { echo -e "\n\n❌ Aborting as requested."; exit 1; } + gum confirm "➡️ Select \"yes\" once the machine rebooted and you unlocked the disks." || { echo -e "\n\n❌ Aborting as requested."; exit 1; } FOUND="false" i="0" while FOUND="false"; do if ping -c1 -W1 $HOME_SERVER_IP >/dev/null 2>&1; then FOUND="true" - exit 0 else (i++) if [[ "\${i}" -gt 150 ]]; then