refact: dialogs

Author: simonwalz

system/cuos/app-init.sh

@@ -13,14 +13,17 @@ HOME="${HOME:-/root}"
 export CONFIG_PATH="/system.json"
 LAST_CONFIG_PATH="/system_next.json"
 
-INSTALL_MENU="$(jq -r '.install_menu // false' "${CONFIG_PATH}")"
-if [[ "${INSTALL_MENU}" != "false" ]]; then
-  report_info "cuos:installation:started" "Starting installation ..."
-  "${SCRIPT_DIR}/dialog-maintenance.sh" --install "${INSTALL_MENU}"
-  report_info "cuos:installation:done" "Installation done. Starting up system.."
-fi
+init_dialogs() {
+  INSTALL_MENU="$(jq -r '.install_menu // false' "${CONFIG_PATH}")"
+  if [[ "${INSTALL_MENU}" != "false" && ! -f "/data/installed" ]]; then
+    report_info "cuos:installation:started" "Starting installation ..."
+    "${SCRIPT_DIR}/dialog-maintenance.sh" --install "${INSTALL_MENU}"
+    report_info "cuos:installation:done" "Installation done. Starting up system.."
+  fi
+  touch "/data/installed"
 
-"${SCRIPT_DIR}/dialog-reports.sh" &
+  "${SCRIPT_DIR}/dialog-reports.sh" &
+}
 
 action_on_failure() {
   sleep 60
@@ -89,15 +92,23 @@ download_image() {
   done
 }
 
+if [[ -f "${SCRIPT_DIR}/custom-app-init.sh" ]]; then
+  # shellcheck source=/dev/null
+  source "${SCRIPT_DIR}/custom-app-init.sh"
+fi
+
+init_dialogs
+
 CONTAINER_NAME="cuos-app"
 if ! INITIAL_IMAGE="$(image_url "init" || image_url "initial")"; then
   report_err "cuos:application:image_not_defined" "Application image not defined"
   action_on_failure
 fi
 INITIAL_IMAGE_VERSION="$(image_version "${INITIAL_IMAGE}")"
+INITIAL_DIGEST="$(jq -r '.init_image_digest // .initial_image_digest // empty' "${CONFIG_PATH}")"
 
-LAST_INITIAL_IMAGE_VERSION="$(jq -r '.initial_image_version // empty' "${LAST_CONFIG_PATH}" 2>/dev/null)"
-INITIAL_DIGEST="$(jq -r '.initial_image_digest // empty' "${CONFIG_PATH}")"
+LAST_INITIAL_IMAGE="$(docker inspect --format='{{.Config.Image}}' "${CONTAINER_NAME}" 2>/dev/null)" || true
+LAST_INITIAL_IMAGE_VERSION="$(image_version "${LAST_INITIAL_IMAGE}")" || true
 
 
 echo "Waiting for Docker to be ready..."
@@ -171,7 +182,6 @@ if [[ "${UPDATE}" -eq 1 ]]; then
   docker exec "${CONTAINER_NAME}" /api/update 2>/dev/null || true
 
   state '.state' 'running'
-  state jq '.start_date = (now | todate)'
 
   report_notice "cuos:update:done" "System successfully updated."
 fi

system/cuos/dialog-maintenance.sh

@@ -283,6 +283,7 @@ change_vt
 if [[ "${1:-}" == "--install" ]]; then
   shift
   install_menu "$@"
+  sleep 1
 else
   maintenance_menu "$@"
 fi

system/cuos/dialog-reports.sh

@@ -5,6 +5,21 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 # shellcheck source=/dev/null
 source "${SCRIPT_DIR}/lib-dialog.sh"
 
+dialog_reports_header() {
+  cat <<EOF
+
+## Operating System started successfully.
+
+Host: $(hostname)
+Start Time:  $(jq -r '.start_date | sub("T"; " ") | sub("Z"; " UTC")' /data/state.json)
+Last Update: $(jq -r '.last_update_date | sub("T"; " ") | sub("Z"; " UTC")' /data/state.json)
+
+## Reports
+
+EOF
+
+}
+
 if [[ -f "${SCRIPT_DIR}/custom-dialog.sh" ]]; then
   # shellcheck source=/dev/null
   source "${SCRIPT_DIR}/custom-dialog.sh"
@@ -21,14 +36,7 @@ change_vt
   trap cleanup EXIT
 
   tmpfile=$(mktemp)
-  cat <<EOF >"$tmpfile"
-
-Host: $(hostname)
-
-Start Time:  $(jq -r '.start_date | sub("T"; " ") | sub("Z"; " UTC")' /data/state.json)
-Last Update: $(jq -r '.last_update_date | sub("T"; " ") | sub("Z"; " UTC")' /data/state.json)
-
-EOF
+  dialog_reports_header >"$tmpfile"
 
   journalctl \
     --identifier=cuos \

system/cuos/init.sh

@@ -466,6 +466,7 @@ if [[ "${1:-}" = "--reinit" ]]; then
   fi
 else
   report_info "cuos:init:start" "System startup"
+  state jq '.start_date = (now | todate)'
 fi
 
 prepare_data_volume