Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Commit 3aabe1b

Browse files
v9.20
Bug Fix: Multiple instances error with some apps. Bug Fix: Wrong sd-ext detection on some devices.
1 parent 4c13b3a commit 3aabe1b

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

changelog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,5 @@ v9.00 - Added: Option to exclude dalvik-cache from backups (-xd flag).
228228
v9.10 - Added: Exclude dalvik-cache from sd-ext
229229
Bug Fix: WRONG_ARGS displayed on help screen.
230230
Bug Fix: Minor fixes and improvements.
231+
v9.20 - Bug Fix: Multiple instances error with some apps.
232+
Bug Fix: Wrong sd-ext detection on some devices.

onandroid

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
###########################################################################################################
3030

3131
#### Define constants
32-
version="9.10"
32+
version="9.20"
3333
blobsdir="/clockworkmod/blobs"
3434
tz="utc"
3535
req_power=10
@@ -160,6 +160,7 @@ LANG_VERIFYMD5SUM="Verifying md5sum"
160160
LANG_BACKUPCOMPL="Online Nandroid Backup Completed in"
161161
LANG_FILESBKPEDUP="Files Backed-up"
162162
LANG_INVALIDARGS="One or more of the arguments passed are invalid!"
163+
LANG_MLTIINST="Another instance of Online Nandroid is already running!"
163164
LANG_USAGE="Usage"
164165
LANG_OPTIONS="Options"
165166
LANG_FLAGH="display this help message and exit"
@@ -750,14 +751,14 @@ rtt(){
750751
exit 0
751752
}
752753

753-
#### Check if another instance is running and exit if so
754-
if $bb [ -f $pidfile ]; then
755-
pid="`$bb cat $pidfile`"
756-
if $bb [ "`$bb ps | $bb awk '{print $1}' | $bb grep $pid`" != "" ]; then
757-
$bb echo "$LANG_ERROR: Another instance of Online Nandroid is already running! $LANG_EXITING..."
758-
exit $E_DUPINS
759-
fi
760-
fi
754+
#### Check if another instance is running and exit if so (temporarily disabled due to bugs in apps)
755+
#if $bb [ -f $pidfile ]; then
756+
# pid="`$bb cat $pidfile`"
757+
# if $bb [ "`$bb ps | $bb awk '{print $1}' | $bb grep $pid`" != "" ]; then
758+
# $bb echo "$LANG_ERROR: $LANG_MULTIINST $LANG_EXITING..."
759+
# exit $E_DUPINS
760+
# fi
761+
#fi
761762

762763
#### Output PID
763764
$bb echo "$$" >$pidfile
@@ -1708,7 +1709,7 @@ if $bb [ ! "$sdextdir" ]; then
17081709
if $bb [ ! "$sdextdir" ]; then
17091710
sdextdir="/sd-ext"
17101711
fi
1711-
sdext_mount=`$bb mount | $bb grep -v "/mnt/asec/" | $bb grep -v "sdhci" | $bb egrep "($sdextdir|sd|ext).* type ext[234]" | $bb tail -n 1`
1712+
sdext_mount=`$bb mount | $bb grep -v "/mnt/asec/" | $bb grep -v "sdhci" | $bb grep -v "sdcc" | $bb egrep "($sdextdir|sd|ext).* type ext[234]" | $bb tail -n 1`
17121713
else
17131714
sdext_mount=`$bb mount | $bb grep -v "/mnt/asec/" | $bb grep -v "sdhci" | $bb egrep "$sdextdir type" | $bb tail -n 1`
17141715
fi

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.10
1+
9.20

0 commit comments

Comments
 (0)