ADHOC/replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

backuptool: Don't rely on the order of the elements in the list

Browse Source 
We should not test symlinks using -e or -f, otherwise the order in
which the files are backed up and restored matters.

Change-Id: I9b87972b27a63ef562c0c5f46f943eafd0a08ce1
This commit is contained in:
Gabriele M 2017-02-26 21:01:38 +01:00 committed by Jason Riordan
parent 70e53042eb
commit cf276aa7cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prebuilt/common/bin/backuptool.functions
View File

@ -8,7 +8,7 @@ export S=/system
export V=13.0 export V=13.0
backup_file() { backup_file() {
if [ -e "$1" ]; then if [ -e "$1" -o -L "$1" ]; then
local F=`basename "$1"` local F=`basename "$1"`
local D=`dirname "$1"` local D=`dirname "$1"`
# dont backup any apps that have odex files, they are useless # dont backup any apps that have odex files, they are useless
@ -24,7 +24,7 @@ backup_file() {
restore_file() { restore_file() {
local FILE=`basename "$1"` local FILE=`basename "$1"`
local DIR=`dirname "$1"` local DIR=`dirname "$1"`
if [ -e "$C/$DIR/$FILE" ]; then if [ -e "$C/$DIR/$FILE" -o -L "$C/$DIR/$FILE" ]; then
if [ ! -d "$DIR" ]; then if [ ! -d "$DIR" ]; then
mkdir -p "$DIR"; mkdir -p "$DIR";
fi fi