Reorder PS1 prompts for season and contest pack

- Ask PS1 mode first, then season and style for single

dotfiles/install/install-linux-global.sh

@@ -28,16 +28,6 @@ season_choice=""
 style_choice="aurora"
 style_pack="standard"
 if [[ -t 0 ]]; then
-  echo "Style pack:"
-  echo "  1) Standard (Aurora)"
-  echo "  2) Contest pack (choose from 5 styles)"
-  read -r -p "Choose [1]: " style_pack_pick
-  case "${style_pack_pick}" in
-    2) style_pack="contest" ;;
-    ""|1) style_pack="standard" ;;
-    *) echo "Invalid choice, using standard."; style_pack="standard" ;;
-  esac
-
   echo "Install options:"
   echo "  1) PS1 only"
   echo "  2) Banner only"
@@ -52,12 +42,12 @@ if [[ -t 0 ]]; then
 
   if [[ "$install_ps1" -eq 1 ]]; then
     echo
-    echo "Season mode:"
-    echo "  1) Dynamic (auto by date)"
-    echo "  2) Static (pick one season)"
-    read -r -p "Choose [1]: " season_mode_choice
+    echo "PS1 mode:"
+    echo "  1) Single season (static)"
+    echo "  2) Dynamic season (changing)"
+    read -r -p "Choose [2]: " season_mode_choice
     case "${season_mode_choice}" in
-      2)
+      1)
         season_mode="static"
         echo "Pick a season:"
         echo "  1) Winter"
@@ -72,13 +62,26 @@ if [[ -t 0 ]]; then
           ""|1) season_choice="winter" ;;
           *) echo "Invalid choice, using winter."; season_choice="winter" ;;
         esac
+
+        echo
+        echo "Style pack:"
+        echo "  1) Standard (Aurora)"
+        echo "  2) Contest pack (choose from 5 styles)"
+        read -r -p "Choose [1]: " style_pack_pick
+        case "${style_pack_pick}" in
+          2) style_pack="contest" ;;
+          ""|1) style_pack="standard" ;;
+          *) echo "Invalid choice, using standard."; style_pack="standard" ;;
+        esac
         ;;
-      ""|1)
+      ""|2)
         season_mode="dynamic"
+        style_pack="standard"
         ;;
       *)
         echo "Invalid choice, using dynamic."
         season_mode="dynamic"
+        style_pack="standard"
         ;;
     esac
 

dotfiles/install/install-macos-user.sh

@@ -18,22 +18,12 @@ season_choice=""
 style_choice="aurora"
 if [[ -t 0 ]]; then
   style_pack="standard"
-  echo "Style pack:"
-  echo "  1) Standard (Aurora)"
-  echo "  2) Contest pack (choose from 5 styles)"
-  read -r -p "Choose [1]: " style_pack_pick
-  case "${style_pack_pick}" in
-    2) style_pack="contest" ;;
-    ""|1) style_pack="standard" ;;
-    *) echo "Invalid choice, using standard."; style_pack="standard" ;;
-  esac
-
-  echo "Season mode:"
-  echo "  1) Dynamic (auto by date)"
-  echo "  2) Static (pick one season)"
-  read -r -p "Choose [1]: " season_mode_choice
+  echo "PS1 mode:"
+  echo "  1) Single season (static)"
+  echo "  2) Dynamic season (changing)"
+  read -r -p "Choose [2]: " season_mode_choice
   case "${season_mode_choice}" in
-    2)
+    1)
       season_mode="static"
       echo "Pick a season:"
       echo "  1) Winter"
@@ -48,13 +38,26 @@ if [[ -t 0 ]]; then
         ""|1) season_choice="winter" ;;
         *) echo "Invalid choice, using winter."; season_choice="winter" ;;
       esac
+
+      echo
+      echo "Style pack:"
+      echo "  1) Standard (Aurora)"
+      echo "  2) Contest pack (choose from 5 styles)"
+      read -r -p "Choose [1]: " style_pack_pick
+      case "${style_pack_pick}" in
+        2) style_pack="contest" ;;
+        ""|1) style_pack="standard" ;;
+        *) echo "Invalid choice, using standard."; style_pack="standard" ;;
+      esac
       ;;
-    ""|1)
+    ""|2)
       season_mode="dynamic"
+      style_pack="standard"
       ;;
     *)
       echo "Invalid choice, using dynamic."
       season_mode="dynamic"
+      style_pack="standard"
       ;;
   esac