continuity fixes

snwh · May 20, 2018 · a91a309 · a91a309
1 parent 892af1e
commit a91a309
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 121 deletions.
diff --git a/functions/checks → functions/check_functions b/functions/checks → functions/check_functions
diff --git a/functions/install_favs b/functions/install_favs
@@ -0,0 +1,23 @@
+# Install preferred apps
+function install_favs {
+ # Update the list of packages in 'data/favs.list' to suit your preferences
+ install_from_list favs "preferred applications" main
+}
+
+# Install preferred development tools
+function install_favs_dev {
+ # Update the list of packages in 'data/favs-dev.list' to suit your preferences
+ install_from_list favs-dev "preferred development tools" main
+}
+
+# Install preferred utilities
+function install_favs_utils {
+ # Update the list of packages in 'data/favs-utils.list' to suit your preferences
+ install_from_list favs-utils "preferred utilities" main
+}
+
+# Install preferred GNOME apps
+function install_codecs {
+ # Update the list of packages in 'data/codecs.list' to suit your preferences
+ install_from_list codecs "multimedia codecs" main
+}
diff --git a/functions/install_flatpak_apps b/functions/install_flatpak_apps
@@ -41,7 +41,7 @@ function install_flatpak_apps {
  NAME="Flatpak Applications"
  echo_message title "Starting installation of ${NAME,,}..."
  # Draw window
- FLATPAKAPPS=$(eval `resize` && whiptail \
+ FLATPAKS=$(eval `resize` && whiptail \
  --notags \
  --title "Install $NAME" \
  --menu "\nWhat ${NAME,,} would you like to install?" \
@@ -56,11 +56,11 @@ function install_flatpak_apps {
 
  # check exit status
  if [ $? = 0 ]; then
- echo_message header "Starting '$FLATPAKAPPS' function..."
- $FLATPAKAPPS
+ echo_message header "Starting '$FLATPAKS' function..."
+ $FLATPAKS
  else
  # Cancelled
- echo_message info "Installation of ${NAME,,} cancelled."
+ echo_message info "Installation of ${NAME} cancelled."
  main
  fi
 }
diff --git a/functions/install_fonts b/functions/install_fonts
@@ -14,21 +14,26 @@ function install_mscorefonts {
 
 # Install Fonts
 function install_fonts {
- echo_message title "Starting 'fonts' function..."
- # check exit status
- EXITSTATUS=$?
- if [ $EXITSTATUS = 0 ]; then
- # Draw window
- $(eval `resize` && whiptail \
+ NAME="Fonts"
+ echo_message title "Starting ${NAME,,}..."
+ # Draw window
+ FONTS=$(eval `resize` && whiptail \
  --notags \
- --title "Install Fonts" \
+ --title "Install $NAME" \
  --menu "\nWhat would you like to do?" \
+ --ok-button "Install" \
  --cancel-button "Go Back" \
  $LINES $COLUMNS $(( $LINES - 12 )) \
- install_favs_fonts 'Install favourite fonts' \
- install_mscorefonts 'Install Microsoft core fonts' \
+ 'install_favs_fonts' 'Install favourite fonts' \
+ 'install_mscorefonts' 'Install Microsoft core fonts' \
  3>&1 1>&2 2>&3)
+ # check exit status
+ if [ $? = 0 ]; then
+ echo_message header "Starting '$FONTS' function"
+ $FONTS
  else
+ # Cancelled
+ echo_message info "$NAME installation cancelled."
  main
  fi
 }
diff --git a/functions/install_functions b/functions/install_functions
@@ -1,29 +1,5 @@
 #!/bin/bash
 
-# Install preferred apps
-function install_favs {
- # Update the list of packages in 'data/favs.list' to suit your preferences
- install_from_list favs "preferred applications" main
-}
-
-# Install preferred development tools
-function install_favs_dev {
- # Update the list of packages in 'data/favs-dev.list' to suit your preferences
- install_from_list favs-dev "preferred development tools" main
-}
-
-# Install preferred utilities
-function install_favs_utils {
- # Update the list of packages in 'data/favs-utils.list' to suit your preferences
- install_from_list favs-utils "preferred utilities" main
-}
-
-# Install preferred GNOME apps
-function install_codecs {
- # Update the list of packages in 'data/codecs.list' to suit your preferences
- install_from_list codecs "multimedia codecs" main
-}
-
 # Install from list
 function install_from_list() {
  # echo_message header "Starting 'install_from_list' function..."

diff --git a/functions/install_gnome b/functions/install_gnome
@@ -5,6 +5,7 @@ function install_gnome_apps {
  # Update the list of packages in 'data/gnome-apps.list' to suit your preferences
  install_from_list gnome-apps "preferred GNOME apps" install_gnome
 }
+
 # Install GNOME Shell Extensions
 function install_shell_extensions {
  # Update the list of packages in 'data/gnome-shell-extensions.list' to suit your preferences

diff --git a/functions/install_snap_apps b/functions/install_snap_apps
@@ -36,7 +36,7 @@ function install_snap_apps {
  NAME="Snap Applications"
  echo_message title "Starting installation of ${NAME,,}..."
  # Draw window
- FLATPAKAPPS=$(eval `resize` && whiptail \
+ SNAPS=$(eval `resize` && whiptail \
  --notags \
  --title "Install $NAME" \
  --menu "\nWhat ${NAME,,} would you like to install?" \
@@ -52,8 +52,8 @@ function install_snap_apps {
 
  # check exit status
  if [ $? = 0 ]; then
- echo_message header "Starting '$FLATPAKAPPS' function..."
- $FLATPAKAPPS
+ echo_message header "Starting '$SNAPS' function..."
+ $SNAPS
  else
  # Cancelled
  echo_message info "Installation of ${NAME,,} cancelled."

diff --git a/functions/node_apps b/functions/node_apps
diff --git a/ubuntu-post-install-script.sh b/ubuntu-post-install-script.sh
@@ -40,8 +40,8 @@ function main {
  $LINES $COLUMNS $(( $LINES - 12 )) \
  'system_update' 'Perform system updates' \
  'install_favs' 'Install preferred applications' \
- 'install_favs_utils' 'Install preferred utilities' \
  'install_favs_dev' 'Install preferred development tools' \
+ 'install_favs_utils' 'Install preferred utilities' \
  'install_gnome' 'Install preferred GNOME software' \
  'install_codecs' 'Install multimedia codecs' \
  'install_fonts' 'Install additional fonts' \