commit 14dbdf84a0c5b30d70125fd19f9a644cce84f005
author Treehugger Robot <treehugger-gerrit@google.com> Sun Oct 23 04:16:44 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Oct 23 04:16:44 2022 +0000
tree 45c22072e52b3446b3b82956ad9b49c68ff5af76
parent 5e26cfd4d6f3a3624e6ddc90392ad730fb899661
parent 187c96e07db6f0115861809370ad2fc3891d1c42

Merge "vm_shell: validate selected CID"

vm/vm_shell.sh

diff --git a/vm/vm_shell.sh b/vm/vm_shell.sh
index ec9243b..8217901 100755
--- a/vm/vm_shell.sh
+++ b/vm/vm_shell.sh
@@ -40,12 +40,7 @@
     exit 1
 fi
 
-if [ -n "${selected_cid}" ]; then
-    if [[ ! " ${available_cids[*]} " =~ " ${selected_cid} " ]]; then
-        echo VM of CID $selected_cid does not exist. Available CIDs: ${available_cids}
-        exit 1
-    fi
-else
+if [ ! -n "${selected_cid}" ]; then
     PS3="Select CID of VM to adb-shell into: "
     select cid in ${available_cids}
     do
@@ -54,4 +49,9 @@
     done
 fi
 
+if [[ ! " ${available_cids[*]} " =~ " ${selected_cid} " ]]; then
+    echo VM of CID $selected_cid does not exist. Available CIDs: ${available_cids}
+    exit 1
+fi
+
 connect_vm ${selected_cid}