|
29 | 29 | ########################################################################################################### |
30 | 30 |
|
31 | 31 | #### Define constants |
32 | | -version="9.10" |
| 32 | +version="9.20" |
33 | 33 | blobsdir="/clockworkmod/blobs" |
34 | 34 | tz="utc" |
35 | 35 | req_power=10 |
@@ -160,6 +160,7 @@ LANG_VERIFYMD5SUM="Verifying md5sum" |
160 | 160 | LANG_BACKUPCOMPL="Online Nandroid Backup Completed in" |
161 | 161 | LANG_FILESBKPEDUP="Files Backed-up" |
162 | 162 | LANG_INVALIDARGS="One or more of the arguments passed are invalid!" |
| 163 | +LANG_MLTIINST="Another instance of Online Nandroid is already running!" |
163 | 164 | LANG_USAGE="Usage" |
164 | 165 | LANG_OPTIONS="Options" |
165 | 166 | LANG_FLAGH="display this help message and exit" |
@@ -750,14 +751,14 @@ rtt(){ |
750 | 751 | exit 0 |
751 | 752 | } |
752 | 753 |
|
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 |
761 | 762 |
|
762 | 763 | #### Output PID |
763 | 764 | $bb echo "$$" >$pidfile |
@@ -1708,7 +1709,7 @@ if $bb [ ! "$sdextdir" ]; then |
1708 | 1709 | if $bb [ ! "$sdextdir" ]; then |
1709 | 1710 | sdextdir="/sd-ext" |
1710 | 1711 | 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` |
1712 | 1713 | else |
1713 | 1714 | sdext_mount=`$bb mount | $bb grep -v "/mnt/asec/" | $bb grep -v "sdhci" | $bb egrep "$sdextdir type" | $bb tail -n 1` |
1714 | 1715 | fi |
|
0 commit comments