mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-24 19:10:24 +00:00
Unify the 2 local zed scripts, take a flag for instance count
This commit is contained in:
Max Brunsfeld
parent
b2d735e573
commit
a0ab9fe56b
3 changed files with 88 additions and 65 deletions
|
|
@ -1,59 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
if [[ -z "$GITHUB_TOKEN" ]]; then
|
||||
cat <<-MESSAGE
|
||||
Missing \`GITHUB_TOKEN\` environment variable. This token is needed
|
||||
for fetching your GitHub identity from the command-line.
|
||||
|
||||
Create an access token here: https://github.com/settings/tokens
|
||||
Then edit your \`~/.zshrc\` (or other shell initialization script),
|
||||
adding a line like this:
|
||||
|
||||
export GITHUB_TOKEN="(the token)"
|
||||
|
||||
MESSAGE
|
||||
exit 1
|
||||
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.
|
||||
username_1=$(curl -sH "Authorization: bearer $GITHUB_TOKEN" https://api.github.com/user | jq -r .login)
|
||||
username_2=nathansobo
|
||||
if [[ $username_1 == $username_2 ]]; then
|
||||
username_2=as-cii
|
||||
fi
|
||||
|
||||
# Make each Zed instance take up half of the screen.
|
||||
output=$(system_profiler SPDisplaysDataType -json)
|
||||
main_display=$(echo "$output" | jq '.SPDisplaysDataType[].spdisplays_ndrvs[] | select(.spdisplays_main == "spdisplays_yes")')
|
||||
resolution=$(echo "$main_display" | jq -r '._spdisplays_resolution')
|
||||
width=$(echo "$resolution" | jq -Rr 'match("(\\d+) x (\\d+)").captures[0].string')
|
||||
half_width=$(($width / 2))
|
||||
height=$(echo "$resolution" | jq -Rr 'match("(\\d+) x (\\d+)").captures[1].string')
|
||||
y=0
|
||||
|
||||
position_1=0,${y}
|
||||
position_2=${half_width},${y}
|
||||
|
||||
# Authenticate using the collab server's admin secret.
|
||||
export ZED_STATELESS=1
|
||||
export ZED_ALWAYS_ACTIVE=1
|
||||
export ZED_ADMIN_API_TOKEN=secret
|
||||
export ZED_SERVER_URL=http://localhost:8080
|
||||
export ZED_WINDOW_SIZE=${half_width},${height}
|
||||
|
||||
cargo build
|
||||
sleep 0.5
|
||||
|
||||
# Start the two Zed child processes. Open the given paths with the first instance.
|
||||
trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
|
||||
ZED_IMPERSONATE=${ZED_IMPERSONATE:=${username_1}} ZED_WINDOW_POSITION=${position_1} target/debug/Zed $@ &
|
||||
SECOND=true ZED_IMPERSONATE=${username_2} ZED_WINDOW_POSITION=${position_2} target/debug/Zed &
|
||||
wait
|
||||
88
script/zed-local
Executable file
88
script/zed-local
Executable file
|
|
@ -0,0 +1,88 @@
|
|||
#!/usr/bin/env node
|
||||
|
||||
const {spawn, execFileSync} = require('child_process')
|
||||
|
||||
const RESOLUTION_REGEX = /(\d+) x (\d+)/
|
||||
const DIGIT_FLAG_REGEX = /^--?(\d+)$/
|
||||
|
||||
const args = process.argv.slice(2)
|
||||
|
||||
// Parse the number of Zed instances to spawn.
|
||||
let instanceCount = 1
|
||||
const digitMatch = args[0]?.match(DIGIT_FLAG_REGEX)
|
||||
if (digitMatch) {
|
||||
instanceCount = parseInt(digitMatch[1])
|
||||
args.shift()
|
||||
}
|
||||
if (instanceCount > 4) {
|
||||
throw new Error('Cannot spawn more than 4 instances')
|
||||
}
|
||||
|
||||
// Parse the resolution of the main screen
|
||||
const displayInfo = JSON.parse(
|
||||
execFileSync(
|
||||
'system_profiler',
|
||||
['SPDisplaysDataType', '-json'],
|
||||
{encoding: 'utf8'}
|
||||
)
|
||||
)
|
||||
const mainDisplayResolution = displayInfo
|
||||
?.SPDisplaysDataType[0]
|
||||
?.spdisplays_ndrvs
|
||||
?.find(entry => entry.spdisplays_main === "spdisplays_yes")
|
||||
?._spdisplays_resolution
|
||||
?.match(RESOLUTION_REGEX)
|
||||
if (!mainDisplayResolution) {
|
||||
throw new Error('Could not parse screen resolution')
|
||||
}
|
||||
const screenWidth = parseInt(mainDisplayResolution[1])
|
||||
const screenHeight = parseInt(mainDisplayResolution[2])
|
||||
|
||||
// Determine the window size for each instance
|
||||
let instanceWidth = screenWidth
|
||||
let instanceHeight = screenHeight
|
||||
if (instanceCount > 1) {
|
||||
instanceWidth = Math.floor(screenWidth / 2)
|
||||
if (instanceCount > 2) {
|
||||
instanceHeight = Math.floor(screenHeight / 2)
|
||||
}
|
||||
}
|
||||
|
||||
let users = [
|
||||
'nathansobo',
|
||||
'as-cii',
|
||||
'maxbrunsfeld',
|
||||
'iamnbutler'
|
||||
]
|
||||
|
||||
// If a user is specified, make sure it's first in the list
|
||||
const user = process.env.ZED_IMPERSONATE
|
||||
if (user) {
|
||||
users = [user].concat(users.filter(u => u !== user))
|
||||
}
|
||||
|
||||
const positions = [
|
||||
'0,0',
|
||||
`${instanceWidth},0`,
|
||||
`0,${instanceHeight}`,
|
||||
`${instanceWidth},${instanceHeight}`
|
||||
]
|
||||
|
||||
execFileSync('cargo', ['build'], {stdio: 'inherit'})
|
||||
|
||||
setTimeout(() => {
|
||||
for (let i = 0; i < instanceCount; i++) {
|
||||
spawn('target/debug/Zed', i == 0 ? args : [], {
|
||||
stdio: 'inherit',
|
||||
env: {
|
||||
ZED_IMPERSONATE: users[i],
|
||||
ZED_WINDOW_POSITION: positions[i],
|
||||
ZED_STATELESS: '1',
|
||||
ZED_ALWAYS_ACTIVE: '1',
|
||||
ZED_SERVER_URL: 'http://localhost:8080',
|
||||
ZED_ADMIN_API_TOKEN: 'secret',
|
||||
ZED_WINDOW_SIZE: `${instanceWidth},${instanceHeight}`
|
||||
}
|
||||
})
|
||||
}
|
||||
}, 0.1)
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
: "${ZED_IMPERSONATE:=as-cii}"
|
||||
export ZED_IMPERSONATE
|
||||
|
||||
ZED_ADMIN_API_TOKEN=secret ZED_SERVER_URL=http://localhost:8080 cargo run $@
|
||||
Loading…
Reference in a new issue