yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ing 2024-11-04 09:44:09 +08:00
parent bcb266c595
commit becbfd1ebd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/initrd/opt/rr/menu.sh
View File

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