Merge pull request jonico#15 from fooforge/fix-recursion-issue

gselva · Feb 11, 2022 · b09593d · b09593d
2 parents e7a3dca + a5b8c22
commit b09593d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.pscale/cli-helper-scripts/use-pscale-docker-image.sh b/.pscale/cli-helper-scripts/use-pscale-docker-image.sh
@@ -17,9 +17,9 @@ function pscale {
  tty=""
  fi
 
- # if NO_DOCKER is set, we will use the natively installed commands
+ # if NO_DOCKER is set, we will use the locally installed version of pscale
  if [ -n "$NO_DOCKER" ]; then
- command="pscale $@"
+ command="`which pscale` $@"
  else
  # For debugging, set PSCALE_VERSION to a version of your choice. It defaults to "latest".
  command="docker run -e PLANETSCALE_SERVICE_TOKEN=${PLANETSCALE_SERVICE_TOKEN:-""} -e PLANETSCALE_SERVICE_TOKEN_ID=$PLANETSCALE_SERVICE_TOKEN_ID -e PLANETSCALE_SERVICE_TOKEN_NAME=$PLANETSCALE_SERVICE_TOKEN_NAME -e HOME=/tmp -v $HOME/.config/planetscale:/tmp/.config/planetscale -e PSCALE_ALLOW_NONINTERACTIVE_SHELL=true --user $(id -u):$(id -g) --rm -i $tty planetscale/pscale:${PSCALE_VERSION:-"latest"} $@"