rainysy/backup_script
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 移除 curl stderr 静默,改用 test -x 检测,增加诊断日志

Browse Source
This commit is contained in:
RainySY
2026-05-12 15:13:34 +08:00
parent 6f287f42b8
commit ad52ebd1a1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/tools.sh
View File

@@ -493,10 +493,11 @@ umount_smb() {
upload_webdav() { upload_webdav() {
[[ -z $remote_url ]] && { echoRgb "remote_url未設置" "0"; return 1; } [[ -z $remote_url ]] && { echoRgb "remote_url未設置" "0"; return 1; }
local CURL local CURL
for p in curl /data/user/0/bin.mt.plus/files/term/bin/curl /system/bin/curl; do for p in /data/user/0/bin.mt.plus/files/term/bin/curl /system/bin/curl curl; do
command -v "$p" >/dev/null 2>&1 && { CURL="$p"; break; } [[ -x $p ]] && { CURL="$p"; break; }
done done
[[ -z $CURL ]] && { echoRgb "未找到curl，無法上傳" "0"; return 1; } [[ -z $CURL ]] && { echoRgb "未找到curl，無法上傳" "0"; return 1; }
echoRgb "使用: $CURL" "2"
local base_url="${remote_url%/}" local base_url="${remote_url%/}"
local failed=0 local failed=0
local list_file="$TMPDIR/.wdav_list" local list_file="$TMPDIR/.wdav_list"
@@ -505,8 +506,8 @@ upload_webdav() {
while read -r f; do while read -r f; do
[[ -z $f ]] && continue [[ -z $f ]] && continue
local rel="${f#$Backup/}" local rel="${f#$Backup/}"
echoRgb "上傳: $rel" "2" echoRgb "上傳: $base_url/$rel" "2"
if "$CURL" -sSf -T "$f" -u "$remote_user:$remote_pass" "$base_url/$rel" 2>/dev/null; then if "$CURL" -sSf -T "$f" -u "$remote_user:$remote_pass" "$base_url/$rel"; then
rm -f "$f" rm -f "$f"
else else
failed=1 failed=1
@@ -525,6 +526,7 @@ upload_webdav() {
remote_setup() { remote_setup() {
[[ -z $remote_type ]] && return [[ -z $remote_type ]] && return
echoRgb "遠程備份: $remote_type -> $remote_url" "3"
case $remote_type in case $remote_type in
smb) smb)
mount_smb || return mount_smb || return