Ask for default apps on terminal mode too (closes #308)

Coauthor: @gtkatakura

Author: David Heinemeier Hansson

install.sh

@@ -4,16 +4,17 @@ set -e
 # Check the distribution name and version and abort if incompatible
 source ~/.local/share/omakub/install/check-version.sh
 
+# Ask for app choices
+echo "Get ready to make a few choices..."
+source ~/.local/share/omakub/install/terminal/required/app-gum.sh >/dev/null
+source ~/.local/share/omakub/install/first-run-choices.sh
+
 # Desktop software and tweaks will only be installed if we're running Gnome
 if [[ "$XDG_CURRENT_DESKTOP" == *"GNOME"* ]]; then
   # Ensure computer doesn't go to sleep or lock while installing
   gsettings set org.gnome.desktop.screensaver lock-enabled false
   gsettings set org.gnome.desktop.session idle-delay 0
 
-  echo "Get ready to make a few choices..."
-  source ~/.local/share/omakub/install/terminal/required/app-gum.sh >/dev/null
-  source ~/.local/share/omakub/install/first-run-choices.sh
-
   echo "Installing terminal and desktop tools..."
 
   # Install terminal tools

install/first-run-choices.sh

@@ -1,6 +1,9 @@
-OPTIONAL_APPS=("1password" "Spotify" "Zoom" "Dropbox")
-DEFAULT_OPTIONAL_APPS='1password,Spotify,Zoom'
-export OMAKUB_FIRST_RUN_OPTIONAL_APPS=$(gum choose "${OPTIONAL_APPS[@]}" --no-limit --selected $DEFAULT_OPTIONAL_APPS --height 7 --header "Select optional apps" | tr ' ' '-')
+# Only ask for default desktop app choices when running Gnome
+if [[ "$XDG_CURRENT_DESKTOP" == *"GNOME"* ]]; then
+  OPTIONAL_APPS=("1password" "Spotify" "Zoom" "Dropbox")
+  DEFAULT_OPTIONAL_APPS='1password,Spotify,Zoom'
+  export OMAKUB_FIRST_RUN_OPTIONAL_APPS=$(gum choose "${OPTIONAL_APPS[@]}" --no-limit --selected $DEFAULT_OPTIONAL_APPS --height 7 --header "Select optional apps" | tr ' ' '-')
+fi
 
 AVAILABLE_LANGUAGES=("Ruby on Rails" "Node.js" "Go" "PHP" "Python" "Elixir" "Rust" "Java")
 SELECTED_LANGUAGES="Ruby on Rails","Node.js"