From cf276aa7cda379b93a38f8e6251fa4fe51eb96d9 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Sun, 26 Feb 2017 21:01:38 +0100 Subject: backuptool: Don't rely on the order of the elements in the list 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 --- prebuilt/common/bin/backuptool.functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions index 9598f23c..d9b2fc09 100644 --- a/prebuilt/common/bin/backuptool.functions +++ b/prebuilt/common/bin/backuptool.functions @@ -8,7 +8,7 @@ export S=/system export V=13.0 backup_file() { - if [ -e "$1" ]; then + if [ -e "$1" -o -L "$1" ]; then local F=`basename "$1"` local D=`dirname "$1"` # dont backup any apps that have odex files, they are useless @@ -24,7 +24,7 @@ backup_file() { restore_file() { local FILE=`basename "$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 mkdir -p "$DIR"; fi -- cgit v1.2.3