Merge pull request #5282 from AuxXxilium/dev

Dev

files/initrd/opt/arc/arc-functions.sh

@@ -2053,7 +2053,7 @@ function greplogs() {
     tar -czf "${TMP_PATH}/logs.tar.gz" -C "${TMP_PATH}" logs
     if [ -z "${SSH_TTY}" ]; then # web
       mv -f "${TMP_PATH}/logs.tar.gz" "/var/www/data/logs.tar.gz"
-      URL="http://${IPCON}/logs.tar.gz"
+      URL="http://${IPCON}:${HTTP_PORT}/logs.tar.gz"
       MSG+="Please via ${URL} to download the logs,\nAnd go to Github or Discord to create an issue and upload the logs."
     else
       sz -be -B 536870912 "${TMP_PATH}/logs.tar.gz"
@@ -2072,9 +2072,9 @@ function getbackup() {
     rm -f "${TMP_PATH}/dsmconfig.tar.gz" >/dev/null
     tar -czf "${TMP_PATH}/dsmconfig.tar.gz" -C "${PART1_PATH}" dsmbackup
     if [ -z "${SSH_TTY}" ]; then # web
-      mv -f "${TMP_PATH}/dsmconfig.tar.gz" "/var/www/data/dsmconfig.tar.gz"
+      cp -f "${TMP_PATH}/dsmconfig.tar.gz" "/var/www/data/dsmconfig.tar.gz"
       chmod 644 "/var/www/data/dsmconfig.tar.gz"
-      URL="http://${IPCON}/dsmconfig.tar.gz"
+      URL="http://${IPCON}:${HTTP_PORT}/dsmconfig.tar.gz"
       dialog --backtitle "$(backtitle)" --colors --title "DSM Config" \
         --msgbox "Please via ${URL}\nto download the dsmconfig and unzip it and back it up in order by file name." 0 0
     else

files/initrd/opt/arc/arc.sh

@@ -659,13 +659,13 @@ function arcSummary() {
     --extra-button --extra-label "Cancel" --msgbox "${SUMMARY}" 0 0
   RET=$?
   case ${RET} in
-    0) # ok-button
+    0)
       make
       ;;
-    3) # extra-button
+    3)
       return 0
       ;;
-    255) # ESC
+    255)
       return 0
       ;;
   esac
@@ -719,9 +719,8 @@ function make() {
     sleep 2
     return 1
   fi
-  STEP="boot"
   if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ -f "${MOD_ZIMAGE_FILE}" ] && [ -f "${MOD_RDGZ_FILE}" ]; then
-    MODELID=$(echo ${MODEL} | sed 's/d$/D/; s/rp$/RP/; s/rp+/RP+/')
+    MODELID="$(echo ${MODEL} | sed 's/d$/D/; s/rp$/RP/; s/rp+/RP+/')"
     writeConfigKey "modelid" "${MODELID}" "${USER_CONFIG_FILE}"
     writeConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
     arcFinish
@@ -739,6 +738,7 @@ function make() {
 ###############################################################################
 # Finish Building Loader
 function arcFinish() {
+  STEP="boot"
   rm -f "${LOG_FILE}" >/dev/null 2>&1 || true
   MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
   if [ -n "${MODELID}" ]; then

files/initrd/opt/arc/ramdisk-patch.sh

@@ -166,8 +166,8 @@ mkdir -p "${RAMDISK_PATH}/addons"
   echo "export PRODUCTVER=\"${PRODUCTVER}\""
   echo "export MLINK=\"${PAT_URL}\""
   echo "export MCHECKSUM=\"${PAT_HASH}\""
-  echo "export LAYOUT=\"${LAYOUT}\""
-  echo "export KEYMAP=\"${KEYMAP}\""
+  echo "export LAYOUT=\"${LAYOUT:-qwerty}\""
+  echo "export KEYMAP=\"${KEYMAP:-en}\""
 } >"${RAMDISK_PATH}/addons/addons.sh"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"