mirror of
https://github.com/RROrg/rr.git
synced 2025-08-24 05:26:59 +08:00
Compare commits
2 Commits
75e12dd213
...
becbfd1ebd
| Author | SHA1 | Date | |
|---|---|---|---|
|
becbfd1ebd | ||
|
|
bcb266c595 |
@ -223,7 +223,7 @@ echo
|
|||||||
echo -e "$(TEXT "User config is on") \033[1;32m${USER_CONFIG_FILE}\033[0m"
|
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 "TTYD: \033[1;34mhttp://rr:7681/\033[0m")"
|
||||||
echo -e "$(TEXT "DUFS: \033[1;34mhttp://rr:7304/\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
|
||||||
echo -e "$(TEXT "Default SSH \033[1;31mroot\033[0m password is") \033[1;31mrr\033[0m"
|
echo -e "$(TEXT "Default SSH \033[1;31mroot\033[0m password is") \033[1;31mrr\033[0m"
|
||||||
echo
|
echo
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,7 +194,7 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
|
msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
|
|||||||
@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYDΖDUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -207,7 +207,7 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "TTYD&DUFS: \\033[1;34mhttp://rr:80/\\033[0m"
|
msgid "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -195,8 +195,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -194,8 +194,8 @@ msgid "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
|||||||
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
msgstr "DUFS: \\033[1;34mhttp://rr:7304/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:226
|
#: init.sh:226
|
||||||
msgid "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:80/\\033[0m"
|
msgstr "TTYD&DUFS: \\033[1;34mhttp://rr:7080/\\033[0m"
|
||||||
|
|
||||||
#: init.sh:228
|
#: init.sh:228
|
||||||
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
msgid "Default SSH \\033[1;31mroot\\033[0m password is"
|
||||||
|
|||||||
@ -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"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user