Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_vendor_cyanogen into gingerbread
This commit is contained in:
commit
4f46538b2f
@ -18,10 +18,18 @@ check_prereq() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_installscript() {
|
check_installscript() {
|
||||||
if [ -f "/tmp/.installscript" -a ! -f "$S/etc/force_backuptool" ];
|
if [ -f "/tmp/.installscript" ] && [ $PROCEED -ne 0 ];
|
||||||
then
|
then
|
||||||
echo "/tmp/.installscript found. Skipping backuptool."
|
# We have an install script, and ROM versions match!
|
||||||
PROCEED=0;
|
# We now need to check and see if we have force_backup
|
||||||
|
# in either /etc or /tmp/backupdir
|
||||||
|
if [ -f "$S/etc/force_backuptool" ] || [ -f "$C/force_backuptool" ];
|
||||||
|
then
|
||||||
|
echo "force_backuptool file found, Forcing backuptool."
|
||||||
|
else
|
||||||
|
echo "/tmp/.installscript found. Skipping backuptool."
|
||||||
|
PROCEED=0;
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -132,12 +140,11 @@ restore_file() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
check_installscript;
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
backup)
|
backup)
|
||||||
mount $S
|
mount $S
|
||||||
check_prereq;
|
check_prereq;
|
||||||
|
check_installscript;
|
||||||
if [ $PROCEED -ne 0 ];
|
if [ $PROCEED -ne 0 ];
|
||||||
then
|
then
|
||||||
rm -rf $C
|
rm -rf $C
|
||||||
@ -152,6 +159,7 @@ case "$1" in
|
|||||||
;;
|
;;
|
||||||
restore)
|
restore)
|
||||||
check_prereq;
|
check_prereq;
|
||||||
|
check_installscript;
|
||||||
if [ $PROCEED -ne 0 ];
|
if [ $PROCEED -ne 0 ];
|
||||||
then
|
then
|
||||||
for file_list in get_files get_custom_files; do
|
for file_list in get_files get_custom_files; do
|
||||||
|
Loading…
Reference in New Issue
Block a user