Skip to content

Commit

Permalink
dev configs for bo and reading from the right ip
Browse files Browse the repository at this point in the history
  • Loading branch information
balbit committed May 3, 2024
1 parent 8bf2e11 commit 35932b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion client/src/services/ServerService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export async function sendLocation(locationInfo: LocationInfo): Promise<void> {
body: JSON.stringify(sendLocationRequest)
}

const LOCAL_IP = process.env.LOCAL_IP;
const LOCAL_IP = process.env.LOCAL_IP;
// TODO: Make request work for both local testing and production
// remember that localhost on the phone is not the same as localhost on the computer

Expand Down
6 changes: 4 additions & 2 deletions env.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

os_name=$(uname -s)
user=$(whoami)

# Check if the OS is macOS
if [[ "$os_name" == "Darwin" ]]; then
Expand All @@ -10,14 +11,15 @@ if [[ "$os_name" == "Darwin" ]]; then
export PATH=$PATH:$ANDROID_HOME/platform-tools
export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home

# Check if the OS is Linux
elif [[ "$os_name" == "Linux" ]]; then
# Elliot's configs
elif [[ "$os_name" == "Linux" && "$user" == "bo" ]]; then
export PATH=$PATH:$HOME/android-studio/bin
export ANDROID_HOME=$HOME/Android/Sdk
export PATH=$PATH:$ANDROID_HOME/emulator
export PATH=$PATH:$ANDROID_HOME/platform-tools
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
export PATH=$PATH:$JAVA_HOME/bin
export LOCAL_IP="10.29.219.234"


# Handle other operating systems
Expand Down

0 comments on commit 35932b8

Please sign in to comment.