refact+fix: dialogs and hostname

Author: simonwalz

system/cuos/dialog-edit-network.sh

@@ -2,9 +2,12 @@
 
 SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
-export DIALOGRC="${SCRIPT_DIR}/dialog.rc"
+# shellcheck source=/dev/null
+source "${SCRIPT_DIR}/utils.sh"
+# shellcheck source=/dev/null
+source "${SCRIPT_DIR}/lib-dialog.sh"
 
-CONFIG_PATH="/system.json"
+CONFIG_PATH="${CONFIG_PATH:-"/system.json"}"
 if [[ -n "${TEST}" ]]; then
 	CONFIG_PATH="system.json"
 fi
@@ -14,20 +17,6 @@ fi
 CONFIG_JSON="$(cat "$CONFIG_PATH" || echo '{}')"
 CONFIG_NEW="{}"
 
-term() {
-	if [[ -n "${TEST}" ]]; then "$@"; return; fi
-	TERM=linux "$@" >/dev/tty1 </dev/tty1
-}
-
-cuos_dialog() {
-	dialog \
-		--colors \
-		--no-trim \
-		--no-collapse \
-		--cr-wrap \
-		"$@"
-}
-
 # --- Validation functions ---
 is_valid_hostname() {
 	[[ "$1" =~ ^[a-zA-Z][a-zA-Z0-9\.-]+$ ]]

system/cuos/dialog-maintenance.sh

@@ -183,7 +183,7 @@ diagnostics_menu() {
       resources) check_resources ;;
       clogs) term_all cuos_logs ;;
       logs) term_all view_logs ;;
-      docker) api_stream "docker ps" 30 120 docker ps ;;
+      docker) api_stream_size "docker ps" 30 120 docker ps ;;
       ping) diagnostics_ping ;;
       dns) diagnostics_dns ;;
       "expert") expert ;;
@@ -247,7 +247,16 @@ diagnostics_dns() {
 expert() {
   confirm=$(DIALOGRC="${SCRIPT_DIR}/dialog-red.rc" term cuos_dialog --title "Expert Settings" --inputbox "You found the hidden expert settings.\nOnly continue, when you know what you are doing." 13 72 3>&1 1>&2 2>&3) || return 1
   if [[ "$confirm" != "CuOS" ]]; then msg "Aborted." "Expert Settings"; return 1; fi
-  term_all vim "+set backupcopy=yes" /system.json
+  cp "/system.json" /tmp/edit-system.json
+  chown nobody:nogroup /tmp/edit-system.json
+  term_all sudo -u nobody rvim /tmp/edit-system.json
+  if ! jq . /tmp/edit-system.json >/dev/null 2>&1; then
+    term msg "Invalid JSON"
+  else
+    cat /tmp/edit-system.json >/system.json
+    api_stream "Applying system.json" cuos patch
+  fi
+  rm -f /tmp/edit-system.json
 }
 
 

system/cuos/dialog-reports.sh

@@ -32,7 +32,7 @@ change_vt
   JOURNAL_PID=$!
 
   term cuos_dialog \
-    --title "System Reports" \
+    --title "System Reports: $(hostname)" \
     --exit-label "Intervention: Start configuration" \
     --tailbox "$tmpfile" 40 100
   EXIT_CODE_DIALOG="$?"

system/cuos/init.sh

@@ -100,7 +100,8 @@ set_hostname() {
       SYSTEM_HOSTNAME="device-${r1}${r2}"
       jq_replace \
         --arg hn "${SYSTEM_HOSTNAME}" \
-        '.hostname = $hn'
+        '.hostname = $hn' \
+        "${CONFIG_PATH}"
   fi
   if [[ -n "${SYSTEM_HOSTNAME}" ]]; then
     echo "Setting hostname to $SYSTEM_HOSTNAME"

system/cuos/lib-dialog.sh

@@ -41,6 +41,7 @@ cuos_dialog() {
     "$@"
 }
 
+
 change_vt() {
   #alternative: TERM=linux setsid -w openvt -s -e -w -- dialog --clear --yesno Hi 6 40
   if [[ -z "${TEST:-}" && -z "${DIALOG_SUB}" ]]; then