fix: replace - with _ in api functions

Author: simonwalz

system/cuos/api.sh

@@ -137,7 +137,7 @@ api_command_pull() {
   return 1
 }
 
-api_command_trigger-update() {
+api_command_trigger_update() {
   docker exec cuos-app /api/cuos-trigger-update
   R="$?"
   # if Container not started or API it not defined, perform cuos update
@@ -178,7 +178,7 @@ api_command_patch() {
 }
 
 ## patch-network      - Patch the network. Provide config object.
-api_command_patch-network_func() {
+api_command_patch_network_func() {
   local input
   input="$(cat)"
 
@@ -197,13 +197,13 @@ api_command_patch-network_func() {
     "${SCRIPT_DIR}/init.sh" --reinit configure_network
   fi
 }
-api_command_patch-network() {
-  api_command_patch-network_func >&2
+api_command_patch_network() {
+  api_command_patch_network_func >&2
   api_handle_code "$?"
 }
 
 ## patch-hostname     - Patch the hostname. Provide config object.
-api_command_patch-hostname_func() {
+api_command_patch_hostname_func() {
   local input
   input="$(cat)"
 
@@ -219,8 +219,8 @@ api_command_patch-hostname_func() {
     "${SCRIPT_DIR}/init.sh" --reinit set_hostname
   fi
 }
-api_command_patch-hostname() {
-  api_command_patch-hostname_func >&2
+api_command_patch_hostname() {
+  api_command_patch_hostname_func >&2
   api_handle_code "$?"
 }
 
@@ -231,7 +231,7 @@ api_command_rollback() {
 }
 
 ## factory-reset      - Factory reset
-api_command_factory-reset() {
+api_command_factory_reset() {
   report_notice "cuos:useraction:factory-reset" "Factory reset triggered by the user"
   setsid "${SCRIPT_DIR}/do-factory-reset.sh" >/data/log/factory-reset.log 2>&1 &
   tail -f /data/log/factory-reset.log

system/cuos/app-init.sh

@@ -191,6 +191,6 @@ fi
 
 state '.state' 'running'
 
-report_info "cuos:startup:ready" "Operation system ready. Starting applications ..."
+report_info "cuos:startup:ready" "Operating system ready. Starting applications ..."
 
 sleep infinity & wait

updater/perform_update.sh

@@ -111,7 +111,7 @@ filename_initrd="${SLOT}_$(basename "${initrd}")"
 if [[ "${OS_ARCH}" == "rpi"* ]]; then
   rm -Rf "${TARGET_BOOT}/firmware_prev" || true
   mkdir -p "${TARGET_BOOT}/firmware_prev" || true
-  mv "${TARGET_BOOT}"/{bcm27*.dtb,bootcode.bin,fixup*.dat,LICENCE.broadcom,config.txt,initramfs*,kernel*.img,overlays,start*.elf} "${TARGET_BOOT}/firmware_prev/" || true
+  mv "${TARGET_BOOT}"/{bcm27*.dtb,bootcode.bin,fixup*.dat,LICENCE.broadcom,config.txt,initramfs*,kernel*.img,overlays,start*.elf} "${TARGET_BOOT}/firmware_prev/" 2>/dev/null || true
   docker cp "${CONTAINER_NAME}:/boot/firmware/." "${TARGET_BOOT}" \
     || raise 112 "Failed to copy kernel"
 
@@ -197,7 +197,7 @@ version="$(basename "${kernel}" | sed 's/vmlinuz-//')"
 
 if [[ "${OS_ARCH}" == "rpi"* ]]; then
 
-  mv "${TARGET_BOOT}"/cmdline.txt "${TARGET_BOOT}"/cmdline-previous.txt
+  mv "${TARGET_BOOT}"/cmdline.txt "${TARGET_BOOT}"/cmdline-previous.txt 2>/dev/null || true
 
   cat <<EOF > "${TARGET_BOOT}/cmdline.txt"
 console=serial0,115200 console=tty1 rootwait root=LABEL=system rootfstype=btrfs rootflags=subvol=${CONTAINER_ROOTFS} fsck.repair=yes ro loglevel=3 noresume apparmor=0