From 7088e86c64328b530c7b36540f72efd3a7fd9022 Mon Sep 17 00:00:00 2001
From: Ofer Shaal <shaalofer@gmail.com>
Date: Tue, 2 Aug 2022 12:09:16 -0400
Subject: [PATCH] Gitpod  - fix pnpm version error (#4120)

* use Gitpod's node-LTS base image

* update gitpod command waiting for port

* export variables for pnpm

* install pnpm using recommended method

* fix prebuild's shell problem

* fix Gitpod ports await command syntax
---
 .gitpod.Dockerfile      | 2 +-
 .gitpod/gitpod-setup.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index e6dbb0118361..b5c2057344e3 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,7 +1,7 @@
 FROM gitpod/workspace-node
 
 # Install latest pnpm
-RUN pnpm i -g pnpm
+RUN curl -fsSL https://get.pnpm.io/install.sh | SHELL=`which bash` bash -
 
 # Install deno in gitpod
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
diff --git a/.gitpod/gitpod-setup.sh b/.gitpod/gitpod-setup.sh
index 883b3b1c97f7..0e739c46dd7b 100755
--- a/.gitpod/gitpod-setup.sh
+++ b/.gitpod/gitpod-setup.sh
@@ -15,7 +15,7 @@ else
 fi
 
 # Wait for VSCode to be ready (port 23000)
-gp await-port 23000 > /dev/null 2>&1
+gp ports await 23000 > /dev/null 2>&1
 
 echo "Loading example project:" $EXAMPLE_PROJECT