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

bug fix

Browse Source
This commit is contained in:
YAWAsau
2021-11-15 23:55:23 +08:00
parent baae8c298a
commit ae096eaf1c
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/bin/bin.sh
View File

@@ -18,7 +18,7 @@ if [[ -d $(magisk --path 2>/dev/null) ]]; then
else else
echo "Magisk busybox Path does not exist" echo "Magisk busybox Path does not exist"
fi ; export PATH="$PATH" fi ; export PATH="$PATH"
backup_version="V11.4 2021/11/8-22:30" backup_version="V11.5 2021/11/15-23:30"
#設置二進制命令目錄位置 #設置二進制命令目錄位置
[[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2 [[ $bin_path = "" ]] && echo "未正確指定bin.sh位置" && exit 2
#bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}" #bin_path="${bin_path/'/storage/emulated/'/'/data/media/'}"

BIN
tools/bin/zip Normal file
View File

Binary file not shown.

24
tools/script/restore
View File

@@ -63,33 +63,33 @@ Release_data() {
[[ -f $app_details ]] && echoRgb "解壓路徑:$(cat "$app_details" | awk "/${FILE_NAME2}path/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" || echoRgb "已經成功解壓縮 但是解壓路徑獲取失敗" "0" [[ -f $app_details ]] && echoRgb "解壓路徑:$(cat "$app_details" | awk "/${FILE_NAME2}path/"'{print $1}' | cut -f2 -d '=' | tail -n1 | sed 's/\"//g')" || echoRgb "已經成功解壓縮 但是解壓路徑獲取失敗" "0"
fi fi
[[ $datapath != "" ]] && echoRgb "解壓縮路徑:$datapath" [[ $datapath != "" ]] && echoRgb "解壓縮路徑:$datapath"
if [[ $FILE_NAME2 = user ]]; then case $FILE_NAME2 in
user)
if [[ -d $X ]]; then if [[ -d $X ]]; then
if [[ -f /config/sdcardfs/$name2/appid ]]; then if [[ -f /config/sdcardfs/$name/appid ]]; then
G="$(cat "/config/sdcardfs/$name2/appid")" G="$(cat "/config/sdcardfs/$name/appid")"
else else
G="$(dumpsys package "$name2" | awk '/userId=/{print $1}' | cut -f2 -d '=' | head -1)" G="$(dumpsys package "$name" | awk '/userId=/{print $1}' | cut -f2 -d '=' | head -1)"
fi ; G="$(echo "$G" | grep -Eo '[0-9]+')" fi ; G="$(echo "$G" | grep -Eo '[0-9]+')"
if [[ $G != "" ]]; then if [[ $G != "" ]]; then
echoRgb "路徑:$X" echoRgb "路徑:$X"
Path_details="$(stat -c "%A/%a %U/%G" "$X")" Path_details="$(stat -c "%A/%a %U/%G" "$X")"
chown -hR "$G:$G" "$X" chown -hR "$G:$G" "$X/"
echo_log "設置用戶組:$(echo "$Path_details" | awk '{print $2}')" echo_log "設置用戶組:$(echo "$Path_details" | awk '{print $2}')"
restorecon -RF "$X/" >/dev/null 2>&1 restorecon -RF "$X/" >/dev/null 2>&1
echo_log "selinux上下文設置" echo_log "selinux上下文設置"
#echoRgb "$(stat -c "%n %A/%a %U/%G" "$X" | awk '{print "路徑:"$1"\n 權限:"$2"\n 用戶組:"$3}')"
else else
echoRgb "uid獲取失敗" "0" echoRgb "uid獲取失敗" "0"
fi fi
else else
echoRgb "路徑$X不存在" "0" echoRgb "路徑$X不存在" "0"
fi fi ;;
elif [[ $FILE_NAME2 = data ]]; then data|obb)
[[ -d $path/data/$name2 ]] && chown -R "1023:1023" "$path/data/$name2" [[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2" ;;
elif [[ $FILE_NAME2 = thanox ]]; then thanox)
restorecon -RF "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1 restorecon -RF "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1
echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" ;;
fi esac
fi fi
} }
#開始循環$txt內的資料進行恢複 #開始循環$txt內的資料進行恢複

19
tools/script/restore2
View File

@@ -100,7 +100,8 @@ if [[ $Recovery_mode = true ]]; then
fi fi
echo_log "$FILE_NAME 解壓縮($FILE_NAME2)" echo_log "$FILE_NAME 解壓縮($FILE_NAME2)"
if [[ $result = 0 ]]; then if [[ $result = 0 ]]; then
if [[ $FILE_NAME2 = user ]]; then case $FILE_NAME2 in
user)
if [[ -d $X ]]; then if [[ -d $X ]]; then
if [[ -f /config/sdcardfs/$name/appid ]]; then if [[ -f /config/sdcardfs/$name/appid ]]; then
G="$(cat "/config/sdcardfs/$name/appid")" G="$(cat "/config/sdcardfs/$name/appid")"
@@ -110,7 +111,7 @@ if [[ $Recovery_mode = true ]]; then
if [[ $G != "" ]]; then if [[ $G != "" ]]; then
echoRgb "路徑:$X" echoRgb "路徑:$X"
Path_details="$(stat -c "%A/%a %U/%G" "$X")" Path_details="$(stat -c "%A/%a %U/%G" "$X")"
chown -hR "$G:$G" "$X" chown -hR "$G:$G" "$X/"
echo_log "設置用戶組:$(echo "$Path_details" | awk '{print $2}')" echo_log "設置用戶組:$(echo "$Path_details" | awk '{print $2}')"
restorecon -RF "$X/" >/dev/null 2>&1 restorecon -RF "$X/" >/dev/null 2>&1
echo_log "selinux上下文設置" echo_log "selinux上下文設置"
@@ -119,13 +120,13 @@ if [[ $Recovery_mode = true ]]; then
fi fi
else else
echoRgb "路徑$X不存在" "0" echoRgb "路徑$X不存在" "0"
fi fi ;;
elif [[ $FILE_NAME2 = data ]]; then data|obb)
[[ -d $path/data/$name2 ]] && chown -R "1023:1023" "$path/data/$name2" [[ -d $path/$FILE_NAME2/$name2 ]] && chmod -R 0777 "$path/$FILE_NAME2/$name2" ;;
elif [[ $FILE_NAME2 = thanox ]]; then thanox)
restorecon -R "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1 restorecon -RF "$(find "/data/system" -name "thanos*" -maxdepth 1 -type d)/" >/dev/null 2>&1
echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" echo_log "selinux上下文設置" && echoRgb "警告 thanox配置恢復後務必重啟\n -否則不生效" "0" ;;
fi esac
fi fi
done done
else else

6
備份應用.sh
View File

@@ -186,7 +186,11 @@ Backup_data() {
echoRgb "$1數據無發生變化 跳過備份" echoRgb "$1數據無發生變化 跳過備份"
fi fi
else else
echoRgb "$1數據不存在跳過備份" if [[ -f $data_path ]]; then
echoRgb "$1是一個文件 不支持備份" "0"
else
echoRgb "$1數據不存在跳過備份"
fi
fi fi
} }
[[ $Lo = true ]] && { [[ $Lo = true ]] && {