summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-31 17:17:13 +0159
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-10-15 22:26:15 +0200
commitf9f07d42edad946fada1884aa39df65e003b4d89 (patch)
treec33c22f81dc89ee0f7ed22b21179256d15f98f30
parenta5bf62753a2910ba3932b56bc7f255f8d7841c44 (diff)
downloadtuna-f9f07d42edad946fada1884aa39df65e003b4d89.tar.gz
merge-gnexus-blobs: Don't barf if fastboot or sudo aren't in PATH
Change-Id: Id562ca720220127d4b0d80f1116cb34253cdcfb0 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rwxr-xr-xmerge-gnexus-blobs4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-gnexus-blobs b/merge-gnexus-blobs
index 77c298a..5da2449 100755
--- a/merge-gnexus-blobs
+++ b/merge-gnexus-blobs
@@ -24,7 +24,7 @@ if [ -z "$SRC" ]; then
exit 1
fi
if [ "`id -u`" != 0 ]; then
- SUDO="`which sudo`"
+ SUDO="`which sudo || :`"
[ -z "$SUDO" ] && SUDO="su -c"
else
SUDO=""
@@ -232,7 +232,7 @@ cp ../recovery-clockwork-touch-6.0.1.0-maguro.img \
zip ../linaro-takju-jro03c.zip boot.img recovery.img system.img userdata.img android-info.txt
cd ..
-FASTBOOT="`which fastboot 2>/dev/null`"
+FASTBOOT="`which fastboot 2>/dev/null || :`"
if [ -n "$FASTBOOT" ]; then
FASTBOOT_SIZE="`ls -l /sbin/fastboot |awk '{ print $5; }'`"
if [ "$FASTBOOT_SIZE" -lt 1024 ]; then