更新 menu.sh，优化 inxi 命令参数以提高系统报告的准确性

files/initrd/opt/rr/init.sh

@@ -223,7 +223,7 @@ echo
 echo -e "$(TEXT "User config is on") \033[1;32m${USER_CONFIG_FILE}\033[0m"
 echo -e "$(TEXT "TTYD: \033[1;34mhttp://rr:7681/\033[0m")"
 echo -e "$(TEXT "DUFS: \033[1;34mhttp://rr:7304/\033[0m")"
-echo -e "$(TEXT "TTYD&DUFS: \033[1;34mhttp://rr:80/\033[0m")"
+echo -e "$(TEXT "TTYD&DUFS: \033[1;34mhttp://rr:7080/\033[0m")"
 echo
 echo -e "$(TEXT "Default SSH \033[1;31mroot\033[0m password is") \033[1;31mrr\033[0m"
 echo

files/initrd/opt/rr/lang/ar_SA/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/de_DE/LC_MESSAGES/rr.po

@@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/en_US/LC_MESSAGES/rr.po

@@ -194,7 +194,7 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr ""
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 msgstr ""
 
 #: init.sh:228

files/initrd/opt/rr/lang/es_ES/LC_MESSAGES/rr.po

@@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/fr_FR/LC_MESSAGES/rr.po

@@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYDΖDUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYDΖDUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/ja_JP/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/ko_KR/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/rr.pot

@@ -207,7 +207,7 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr ""
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 msgstr ""
 
 #: init.sh:228

files/initrd/opt/rr/lang/ru_RU/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/th_TH/LC_MESSAGES/rr.po

@@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/tr_TR/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/uk_UA/LC_MESSAGES/rr.po

@@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/vi_VN/LC_MESSAGES/rr.po

@@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/zh_CN/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/zh_HK/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/lang/zh_TW/LC_MESSAGES/rr.po

@@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
 
 #: init.sh:226
-msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
-msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
+msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
+msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
 
 #: init.sh:228
 msgid "Default SSH \\033[1;31mroot\\033[0m password is"

files/initrd/opt/rr/menu.sh

@@ -2271,14 +2271,14 @@ function cloneBootloaderDisk() {
 }
 
 function systemReport() {
-  data="$(inxi -FzjJxy)"
+  data="$(inxi -c 0 -F 2>/dev/null)"
 
   DIALOG --title "$(TEXT "Advanced")" \
     --yes-label "$(TEXT "Download")" --no-label "$(TEXT "Cancel")" \
     --yesno "${data}" 0 0
   [ $? -ne 0 ] && return
 
-  inxi -FzjJxy >"${TMP_PATH}/system.txt" 2>/dev/null
+  inxi -c 0 -F >"${TMP_PATH}/system.txt" 2>/dev/null
   if [ -z "${SSH_TTY}" ]; then # web
     mv -f "${TMP_PATH}/system.txt" "/var/www/data/system.txt"
     URL="http://$(getIP)/system.txt"
@@ -2345,7 +2345,7 @@ function reportBugs() {
   fi
 
   if [ -n "$(ls -A ${TMP_PATH}/logs 2>/dev/null)" ]; then
-    inxi -FzjJxy >${TMP_PATH}/logs/system.txt 2>/dev/null
+    inxi -c 0 -F >${TMP_PATH}/logs/system.txt 2>/dev/null
     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"