api: add remove_deprecated_app and userinput_func functions

api

@@ -757,6 +757,33 @@ pipx_uninstall() {
   sudo PIPX_HOME=/usr/local/pipx PIPX_BIN_DIR=/usr/local/bin pipx uninstall "$@" || error "Failed to uninstall $* with pipx"
 }
 
+remove_deprecated_app() { # prompts a user to uninstall a deprecated pi-apps application and then removes the application folder if it exists
+  local app="$1" # on app name
+  local removal_arch="$2" # 32 or 64 to only remove one architecture if specified
+  [ -z "$app" ] && error "remove_deprecated_app(): requires an pi-apps app name"
+  local app_status="$(app_status "${app}")"
+  if [ ! -z "$removal_arch" ] && [ "$arch" == "$removal_arch" ] && [ -d "${DIRECTORY}/apps/$app" ] && [ "$app_status" == "installed" ]; then
+    local text="Pi-Apps has deprecated $app for ${removal_arch}-bit OSs which you currently have installed.
+Would you like to uninstall it now or leave it installed? You will NOT be able to uninstall $app with pi-apps later."
+    userinput_func "$text" "Uninstall now" "Leave installed"
+  elif [ ! -z "$removal_arch" ] && [ "$arch" != "$removal_arch" ]; then
+    rm -f "${DIRECTORY}/apps/$app/install-$removal_arch"
+    return 0
+  elif [ -z "$removal_arch" ] && [ -d "${DIRECTORY}/apps/$app" ] && [ "$app_status" == "installed" ]; then
+    local text="Pi-Apps has deprecated $app which you currently have installed.
+Would you like to uninstall it now or leave it installed? You will NOT be able to uninstall $app with pi-apps later."
+    userinput_func "$text" "Uninstall now" "Leave installed"
+  else
+    rm -rf "${DIRECTORY}/apps/$app"
+    return 0
+  fi
+  if [ "$output" == "Uninstall now" ]; then
+    "${DIRECTORY}/manage" uninstall "$app"
+  fi
+  rm -rf "${DIRECTORY}/apps/$app"
+  return 0
+}
+
 terminal_manage() { # wrapper for the original terminal_manage function to terminal_mange_multi
   action="$1"
   app="$2" #one app name
@@ -1377,6 +1404,54 @@ ${category}"
   fi
 }
 
+userinput_func() { # userinput function to display yad/cli prompts to the user
+  [ -z "$1" ] && error "userinput_func(): requires a description"
+  [ -z "$2" ] && error "userinput_func(): requires at least one output selection option"
+  local text_lines=$(echo -e "$1" | wc -l)
+  # there is no good universal way to calculate the required height of the window
+  # the users theme, default text size, and window scaling all affect it
+  # the idea is the height should be a function of the number of lines of input text and the number of list options
+  local height_list=$(echo $(( text_lines * 17 + $(( ${#@} - 1 )) * 29 + 65 )))
+  local commonflags=(--fixed --no-escape --undecorated --center --borders=20)
+  if [ "${#@}" == "2" ];then
+    yad "${yadflags[@]}" "${commonflags[@]}" \
+      --image "dialog-information" \
+      --text="$1" \
+      --button="$2":0
+    output="$2"
+  elif [ "${#@}" == "3" ];then
+    yad "${yadflags[@]}" "${commonflags[@]}" \
+      --image "dialog-question" \
+      --text="$1" \
+      --button="$2":0 \
+      --button="$3":1
+    if [ $? -ne 0 ]; then
+      output="$3"
+    else
+      output="$2"
+    fi
+  else
+    unset uniq_selection
+    for string in "${@:2}"; do
+      local uniq_selection+=(FALSE "$string")
+    done
+    local uniq_selection[0]=TRUE
+    output=$(yad "${yadflags[@]}" "${commonflags[@]}" \
+      --height=$height_list\
+      --text "$1" \
+      --list \
+      --no-headers \
+      --radiolist \
+      --center \
+      --column "" \
+      --column "Selection" \
+      --print-column=2 \
+      --separator='' \
+      --button="OK":0 \
+      "${uniq_selection[@]}")
+  fi
+}
+
 generate_app_icons() { #This converts the given $1 image into icon-24.png and icon-64.png files for the $2 app
   icon="$1"
   app="$2"

etc/categories

@@ -16,7 +16,6 @@ BalenaEtcher|Tools
 Better Chromium|Internet/Browsers
 BleachBit|System Management
 BlockBench|Creative Arts
-BlockPi|Programming
 BlueJ Java IDE|Programming
 Bongo Cam|Multimedia
 Box64|Tools/Emulation
@@ -55,7 +54,6 @@ Ducopanel|Tools
 Eagle CAD|Engineering
 eDEX-UI|Terminals
 Electron Fiddle|Programming
-Email Checker|Internet/Communication
 Epiphany|Internet/Browsers
 ExaGear|Tools/Emulation
 Falkon|Internet/Browsers
@@ -137,7 +135,6 @@ Pale Moon|Internet/Browsers
 PeaZip|Tools
 Persepolis Download Manager|Internet
 Pi-Apps Terminal Plugin (bash)|Tools
-Pi-Apps Terminal Plugin (python)|Tools
 PiGro|Tools
 Pika Backup|System Management
 PiKISS GUI|Tools
@@ -181,7 +178,6 @@ Stunt Rally|hidden
 Sublime Text|Programming
 Synaptic|System Management
 Syncthing|System Management
-Sysmon|System Management
 SysMonTask|System Management
 System Monitoring Center|System Management
 Tabby|Terminals

etc/category-overrides-jetson-18.04

@@ -3,7 +3,6 @@ AntiMicroX|hidden
 Autostar|hidden
 Better Chromium|hidden
 BlockBench|hidden
-BlockPi|hidden
 Box86|hidden
 Boxy SVG|hidden
 Chiaki|hidden

etc/category-overrides-non-raspberry

@@ -1,4 +1,3 @@
-BlockPi|hidden
 Chiaki|hidden
 CommanderPi|hidden
 Downgrade Chromium|hidden

etc/runonce-entries

@@ -62,6 +62,30 @@ runonce <<"EOF"
   refresh_all_pkgapp_status
 EOF
 
+# remove deprecated apps (only when running in a visible terminal)
+case $(ps -o stat= -p $$) in
+  *+*) # Running in foreground
+runonce <<"EOF"
+  #remove deprecated apps
+  remove_deprecated_app "FreeCAD (precompiled)"
+  remove_deprecated_app "Chromium Media Edition"
+  remove_deprecated_app "Cordless"
+  remove_deprecated_app "Retropie"
+  remove_deprecated_app "Raspi2png"
+  remove_deprecated_app "Falkon"
+  remove_deprecated_app "FreeCAD"
+  remove_deprecated_app "LinuxCNC"
+  remove_deprecated_app "Steam" "32"
+  remove_deprecated_app "Cawbird"
+  remove_deprecated_app "Email Checker"
+  remove_deprecated_app "Pi-Apps Terminal Plugin (python)"
+  remove_deprecated_app "Sysmon"
+  remove_deprecated_app "BlockPi"
+  remove_deprecated_app "TBOPlayer"
+EOF
+  ;;
+esac
+
 #remove old apps and migrate chromium downgrading apps to the new "Downgrade Chromium" app
 runonce <<"EOF"
   #rework chromium downgrading apps to one single new app: 'Downgrade Chromium'
@@ -71,23 +95,6 @@ runonce <<"EOF"
     echo "installed" > "${DIRECTORY}/data/status/Downgrade Chromium"
   fi
 
-  #remove deprecated apps
-  rm -rf "${DIRECTORY}/apps/FreeCAD (precompiled)"
-  rm -rf "${DIRECTORY}/apps/Chromium Media Edition"
-  rm -rf "${DIRECTORY}/apps/Cordless"
-  rm -rf "${DIRECTORY}/apps/Retropie"
-  rm -rf "${DIRECTORY}/apps/Raspi2png"
-  rm -rf "${DIRECTORY}/apps/Falkon"
-  rm -rf "${DIRECTORY}/apps/FreeCAD"
-  rm -rf "${DIRECTORY}/apps/LinuxCNC"
-  rm -f "${DIRECTORY}/apps/Steam/install-32"
-  rm -rf "${DIRECTORY}/apps/Cawbird"
-
-  #remove TBOPlayer if it's not already successfully installed
-  if [ "$(app_status TBOPlayer)" != 'installed' ];then
-    rm -rf "${DIRECTORY}/apps/TBOPlayer"
-  fi
-
   #rename 'Turbo Scratch' app to 'Turbowarp'
   rm -rf "${DIRECTORY}/apps/Turbo Scratch"
   mv -f "${DIRECTORY}/data/status/Turbo Scratch" "${DIRECTORY}/data/status/Turbowarp" 2>/dev/null