Merge 08786d64e8 into 7993b98ee1

* fix: remove extra space in remove menu

* fix(spoolman): replace jq with grep
jq isn't included in some minimal installations

kiauh.sh

@@ -82,6 +82,7 @@ function kiauh_update_dialog() {
 }
 
 check_euid
+check_free_space
 init_logfile
 set_globals
 kiauh_update_dialog

scripts/spoolman.sh

@@ -248,13 +248,17 @@ function get_spoolman_status() {
 
 function get_local_spoolman_version() {
   local version
-  version=$(jq -r '.version' "${SPOOLMAN_DIR}"/release_info.json)
+  if [[ -d "${SPOOLMAN_DIR}" ]]; then
+    version=$(grep -o '"version":\s*"[^"]*' "${SPOOLMAN_DIR}"/release_info.json | cut -d'"' -f4)
+  else
+    version=""
+  fi
   echo "${version}"
 }
 
 function get_remote_spoolman_version() {
   local version
-  version=$(curl -s "${SPOOLMAN_REPO}" | jq -r '.tag_name')
+  version=$(curl -s "${SPOOLMAN_REPO}" | grep -o '"tag_name":\s*"v[^"]*"' | cut -d'"' -f4)
   echo "${version}"
 }
 

scripts/ui/remove_menu.sh

@@ -29,7 +29,7 @@ function remove_ui() {
   echo -e "|                           | 15) [Mobileraker]         |"
   echo -e "| Touchscreen GUI:          | 16) [NGINX]               |"
   echo -e "|  7) [KlipperScreen]       | 17) [OctoApp]             |"
-  echo -e "|                           | 18) [Spoolman]             |"
+  echo -e "|                           | 18) [Spoolman]            |"
   echo -e "| 3rd Party Webinterface:   |                           |"
   echo -e "|  8) [OctoPrint]           |                           |"
   back_footer

scripts/utilities.sh

@@ -28,6 +28,29 @@ function check_euid() {
   fi
 }
 
+function check_free_space() {
+  local mount_free mb_rec=2048
+  local mount_check_regex='^/($|bin|etc|home|lib|mnt|opt|root|sbin|tmp|usr|var)' # all root dirs possibly relevant to software install
+  for mount_check in $(cat /etc/mtab | grep '^/dev' | cut -d ' ' -f 2 | grep -E '${mount_check_regex}'); do
+    mount_free=$(($(df -Pk ${mount_check} | sed 1d | grep -v used | awk '{ print $4 "\t" }')/1024))
+    if [[ ${mount_free} -lt ${mb_req} ]]; then
+      local yn
+      while true; do
+        echo -e "${yellow}Heads up! Free disk space in ${white}${mount_check}${yellow} is only ${white}${mount_free} MB${yellow}.${white}"
+        read -p "${yellow}You may run into errors installing or updating software that uses this mountpoint. Proceed? (y|N): ${white}" yn
+        case "${yn}" in
+          Y|y|Yes|yes)
+            break;;
+          N|n|No|no|"")
+            exit 1;;
+          *)
+            echo -e "${red}Please answer "y" or "n"${white}";;
+        esac
+      done
+    fi
+  done
+}
+
 #================================================#
 #============= MESSAGE FORMATTING ===============#
 #================================================#