Commitd76737b

authored

fix: Adjust ./develop.sh script to run in ./site (#142)

Hopefully the last thing I missed in#128 ... this fixes the `./develop.sh` script and `site/dev.ts` to account for the new pathing of `package.json`.

1 parent2afad8b commitd76737bCopy full SHA for d76737b

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ function create_initial_user() {`
`14`	`14`	# TODO: We need to wait for `coderd` to spin up -
`15`	`15`	`# need to replace with a deterministic strategy`
`16`	`16`	`sleep 5s`
`17`		`-`
	`17`	`+`
`18`	`18`	`curl -X POST \`
`19`		`- -d"{\"email\":\"$EMAIL\",\"username\":\"$USERNAME\",\"organization\":\"$ORGANIZATION\",\"password\":\"$PASSWORD\"}" \`
`20`		`- -H'Content-Type:application/json' \`
`21`		`- http://localhost:3000/api/v2/user`
	`19`	`+-d"{\"email\":\"$EMAIL\",\"username\":\"$USERNAME\",\"organization\":\"$ORGANIZATION\",\"password\":\"$PASSWORD\"}" \`
	`20`	`+-H'Content-Type:application/json' \`
	`21`	`+http://localhost:3000/api/v2/user`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`# Do initial build - a dev build for coderd.`
`@@ -29,4 +29,9 @@ make bin/coderd`
`29`	`29`	`# This is a way to run multiple processes in parallel, and have Ctrl-C work correctly`
`30`	`30`	`# to kill both at the same time. For more details, see:`
`31`	`31`	`# https://stackoverflow.com/questions/3004811/how-do-you-run-multiple-programs-in-parallel-from-a-bash-script`
`32`		`-(trap'kill 0' SIGINT; create_initial_user& CODERV2_HOST=http://127.0.0.1:3000 yarn dev& ./bin/coderd)`
	`32`	`+(`
	`33`	`+trap'kill 0' SIGINT`
	`34`	`+ create_initial_user&`
	`35`	`+ CODERV2_HOST=http://127.0.0.1:3000 yarn --cwd=./site dev&`
	`36`	`+ ./bin/coderd`
	`37`	`+)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ if (process.env.CODERV2_HOST) {`
`17`	`17`
`18`	`18`	console.log(`Using CODERV2_HOST:${coderV2Host}`)
`19`	`19`
`20`		`-constapp=next({ dev,dir:"./site"})`
	`20`	`+constapp=next({ dev,dir:"."})`
`21`	`21`	`consthandle=app.getRequestHandler()`
`22`	`22`
`23`	`23`	`app`

Comments

(0)