diff --git a/envsetup.sh b/envsetup.sh
index 7ca0e3a..cefe8ba 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -907,10 +907,10 @@
 {
     # process standard adb options
     local adbTarget=""
-    if [ $1 = "-d" -o $1 = "-e" ]; then
+    if [ "$1" = "-d" -o "$1" = "-e" ]; then
         adbTarget=$1
         shift 1
-    elif [ $1 = "-s" ]; then
+    elif [ "$1" = "-s" ]; then
         adbTarget="$1 $2"
         shift 2
     fi