You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit b43a572
Browse filesBrowse the repository at this point in the historyBrowse files
Copy file name to clipboardExpand all lines: apps/server/src/device/sshDeviceScript.ts
+4-2Lines changed: 4 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -9,8 +9,10 @@ if [ -z "$ANDROID_HOME" ]; then
9
9
elif [ -d "$HOME/Android/Sdk" ]; then export ANDROID_HOME="$HOME/Android/Sdk"; fi
10
10
fi
11
11
if [ -n "$ANDROID_HOME" ]; then export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator:$PATH"; fi
12
-
if [ -z "$JAVA_HOME" ] && ! command -v java >/dev/null 2>&1; then
13
-
for device_java_home in "$HOME/.local/opt/android-studio/jbr" /opt/android-studio/jbr /usr/local/android-studio/jbr /snap/android-studio/current/jbr /Applications/Android\\ Studio.app/Contents/jbr "$HOME/Applications/Android Studio.app/Contents/jbr"; do
12
+
device_java_path="$(command -v java 2>/dev/null)"
13
+
if [ "$device_java_path" = /usr/bin/java ] && [ "$(uname)" = Darwin ] && ! /usr/libexec/java_home >/dev/null 2>&1; then device_java_path=; fi
14
+
if [ -z "$JAVA_HOME" ] && [ -z "$device_java_path" ]; then
15
+
for device_java_home in "$HOME/.local/opt/android-studio/jbr" /opt/android-studio/jbr /usr/local/android-studio/jbr /snap/android-studio/current/jbr /Applications/Android\\ Studio.app/Contents/jbr/Contents/Home "$HOME/Applications/Android Studio.app/Contents/jbr/Contents/Home"; do
14
16
if [ -x "$device_java_home/bin/java" ]; then export JAVA_HOME="$device_java_home"; break; fi
0 commit comments