Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2396 from zed-industries/petros/z-77-the-start-local-collaboration-script-no

Browse source 
Fix script/start-local-collaboration
This commit is contained in:
Petros Amoiridis 2023-04-21 17:36:22 +03:00 • committed by GitHub
commit c3231047ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
script/start-local-collaboration
View file

@ -17,6 +17,12 @@ MESSAGE
exit 1 exit 1
fi fi
# Install jq if it's not installed
if ! command -v jq &> /dev/null; then
echo "Installing jq..."
brew install jq
fi
# Start one Zed instance as the current user and a second instance with a different user. # Start one Zed instance as the current user and a second instance with a different user.
username_1=$(curl -sH "Authorization: bearer $GITHUB_TOKEN" https://api.github.com/user | jq -r .login) username_1=$(curl -sH "Authorization: bearer $GITHUB_TOKEN" https://api.github.com/user | jq -r .login)
username_2=nathansobo username_2=nathansobo
@ -25,22 +31,22 @@ if [[ $username_1 == $username_2 ]]; then
fi fi
# Make each Zed instance take up half of the screen. # Make each Zed instance take up half of the screen.
resolution_line=$(system_profiler SPDisplaysDataType | grep Resolution | head -n1) output=$(system_profiler SPDisplaysDataType -json)
screen_size=($(echo $resolution_line | egrep -o '[0-9]+')) main_display=$(echo "$output" | jq '.SPDisplaysDataType[].spdisplays_ndrvs[] | select(.spdisplays_main == "spdisplays_yes")')
scale_factor=1 resolution=$(echo "$main_display" | jq -r '._spdisplays_resolution')
if [[ $resolution_line =~ Retina ]]; then scale_factor=2; fi width=$(echo "$resolution" | jq -Rr 'match("(\\d+) x (\\d+)").captures[0].string')
width=$(expr ${screen_size[0]} / 2 / $scale_factor) half_width=$(($width / 2))
height=${screen_size[1] / $scale_factor} height=$(echo "$resolution" | jq -Rr 'match("(\\d+) x (\\d+)").captures[1].string')
y=0 y=0
position_1=0,${y} position_1=0,${y}
position_2=${width},${y} position_2=${half_width},${y}
# Authenticate using the collab server's admin secret. # Authenticate using the collab server's admin secret.
export ZED_STATELESS=1 export ZED_STATELESS=1
export ZED_ADMIN_API_TOKEN=secret export ZED_ADMIN_API_TOKEN=secret
export ZED_SERVER_URL=http://localhost:8080 export ZED_SERVER_URL=http://localhost:8080
export ZED_WINDOW_SIZE=${width},${height} export ZED_WINDOW_SIZE=${half_width},${height}
cargo build cargo build
sleep 0.5 sleep 0.5