feat: dialogs for setup and maintenance

Author: simonwalz

system/cuos/app.sh

@@ -63,7 +63,7 @@ download_image() {
 
   while true; do
     check_rollback
-    echo "Pulling $IMAGE_PATH ... (Digest should be ${IMAGE_DIGEST}, but is ${CURRENT_IMAGE_DIGEST})"
+    echo "Pulling $IMAGE_PATH ... (Digest should be ${IMAGE_DIGEST})"
     if docker pull "${INITIAL_IMAGE}"; then
       CURRENT_IMAGE_DIGEST=$(docker image inspect --format '{{index .RepoDigests 0}}' "${IMAGE_PATH}" 2>/dev/null | cut -d'@' -f2)
       if [[ -n "${CURRENT_IMAGE_DIGEST}" && "${CURRENT_IMAGE_DIGEST}" = "${IMAGE_DIGEST}" ]]; then

system/cuos/dialog-maintenance.sh

@@ -232,7 +232,7 @@ 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
-  vim "+set backupcopy=yes" /system.json
+  term vim "+set backupcopy=yes" /system.json
 }
 
 

system/cuos/lib-dialog.sh

@@ -8,7 +8,7 @@ if [[ "${VIRT_TYPE}" == "lxc" ]]; then
 fi
 
 cuos() {
-  [[ -n "${TEST}" ]] && return
+  [[ -n "${TEST:-}" ]] && return
   "${SCRIPT_DIR}/api.sh" "$@"
 }
 export -f cuos
@@ -17,11 +17,11 @@ CUOS_VERSION="$(cuos version)"
 CUOS_VERSION="${CUOS_VERSION/*\//}"
 
 term() {
-  if [[ -n "${TEST}" ]]; then "$@"; return; fi
+  if [[ -n "${TEST:-}" ]]; then "$@"; return; fi
   TERM=linux "$@" >/dev/tty42 </dev/tty42
 }
 term_output() {
-  if [[ -n "${TEST}" ]]; then "$@"; return; fi
+  if [[ -n "${TEST:-}" ]]; then "$@"; return; fi
   TERM=linux "$@" >/dev/tty42
 }
 
@@ -39,7 +39,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
+  if [[ -z "${TEST:-}" && -z "${DIALOG_SUB}" ]]; then
     export DIALOG_SUB=1
 
     VT_OLD="$(fgconsole)"
@@ -124,7 +124,7 @@ valid_ipv4() {
 
 
 
-if [[ -n "${TEST}" && "$(uname)" = "Darwin" ]]; then
+if [[ -n "${TEST:-}" && "$(uname)" = "Darwin" ]]; then
   sed() {
     gsed "$@"
   }