move SelectPartition() out of "interactive non-destructive" stage

2 files changed, 24 insertions, 1 deletions

diff --git a/install.sh b/install.sh
index 876c289..cb87997 100755
--- a/install.sh
+++ b/install.sh
@@ -383,6 +383,13 @@ SelectEnv()
   [[ -n "${language}" ]] && SetStateVar 'LANG' ${language} || exit
 }
 
+NoticePartition()
+{
+  # checks to skip this notice per preset config
+  AreConfiguredStateVars ${STATEVARS_PARTITION[*]} 'READY' || # SelectPartition()
+  WizardDlg "${TR[dlg_partition-${Lang}]}" --msgbox "${TR[notice_partition-${Lang}]}" 0 0
+}
+
 _UmountAll()
 {
   umount /mnt/boot &> /dev/null || true
@@ -670,9 +677,10 @@ NoticeOptional  # Explain that the next decisions are non-essential
 SelectBoot      # Choose to install bootloader
 SelectWmde      # Choose to install graphical environment            (bypassed per SelectDefaults)
 SelectEnv       # Set environment parameters for the target system   (bypassed per SelectDefaults)
-SelectPartition # Choose to partition manually or defer to automatic
 
 ## essential interactive destructive steps ##
+NoticePartition # Explain that the next decisions are mandatory, and destructive
+SelectPartition # Choose to partition manually or defer to automatic
 NoticeReady     # Display chosen options and offer last chance to bail
 Partition       # Partition and mount target disks (may or may not be interactive)
 
diff --git a/translations.sh.inc b/translations.sh.inc
index 443a15b..e5df9c6 100644
--- a/translations.sh.inc
+++ b/translations.sh.inc
@@ -386,6 +386,21 @@ declare -r -A TR=(
   [language-pt]="Escolha a sua língua:"
 
 
+  ## install.sh::NoticePartition() ##
+
+  [dlg_partition-en]="Stage 4 - Partitioning"
+  [dlg_partition-eo]="Etapo 4 - Dispartigi"
+  [dlg_partition-es]="Etapa 4 - Particionado"
+  [dlg_partition-gl]="Etapa 4 - Particionado"
+  [dlg_partition-pt]="Etapa 4 - Particionamento"
+
+  [notice_partition-en]="TODO"
+  [notice_partition-eo]="TODO"
+  [notice_partition-es]="TODO"
+  [notice_partition-gl]="TODO"
+  [notice_partition-pt]="TODO"
+
+
   ## install.sh::SelectPartition() ##
 
   [dlg_part-en]="Format and Mount Partitions"