From bfce69ed837e022f8b199680d92492d474cbdb7d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 25 Oct 2017 08:25:35 -0700
Subject: [PATCH] Update install/build scripts and dockerfiles (#5222)

---
 .travis.yml                                                   | 4 ++--
 tools/debug.sh                                                | 2 +-
 tools/installpsh-debian.sh                                    | 2 +-
 tools/installpsh-osx.sh                                       | 4 ++--
 tools/installpsh-redhat.sh                                    | 2 +-
 .../Images/microsoft_powershell_centos7/Dockerfile            | 2 +-
 .../Images/microsoft_powershell_ubuntu14.04/Dockerfile        | 2 +-
 .../Images/microsoft_powershell_ubuntu16.04/Dockerfile        | 2 +-
 tools/releaseBuild/vstsbuild.sh                               | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0a5387a27..ddbdf11f07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,10 @@ install:
       npm install -g markdown-spellcheck@0.11.0;
     fi
   - ulimit -n 4096
-  - powershell -File tools/travis.ps1 -Bootstrap
+  - pwsh -File tools/travis.ps1 -Bootstrap
 
 script:
-  - powershell -File tools/travis.ps1
+  - pwsh -File tools/travis.ps1
   # spellcheck
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       mdspell '**/*.md' '!powershell/**/*.md' --ignore-numbers --ignore-acronyms --report;
diff --git a/tools/debug.sh b/tools/debug.sh
index 6a542ab924..68a22edc36 100755
--- a/tools/debug.sh
+++ b/tools/debug.sh
@@ -18,5 +18,5 @@ Most useful commands are 'clrstack', 'clrthreads', and 'pe'.
 EOF
 
 pushd debug
-lldb-3.6 -o "plugin load libsosplugin.so" -- ./powershell $@
+lldb-3.6 -o "plugin load libsosplugin.so" -- ./pwsh $@
 popd
diff --git a/tools/installpsh-debian.sh b/tools/installpsh-debian.sh
index acec6402b9..2d82ff6009 100755
--- a/tools/installpsh-debian.sh
+++ b/tools/installpsh-debian.sh
@@ -132,7 +132,7 @@ $SUDO apt-get update
 # Install PowerShell
 $SUDO apt-get install -y powershell
 
-powershell -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
 success=$?
 
 if [[ "$success" != 0 ]]; then
diff --git a/tools/installpsh-osx.sh b/tools/installpsh-osx.sh
index e3b2ae0a58..7dc223b77e 100755
--- a/tools/installpsh-osx.sh
+++ b/tools/installpsh-osx.sh
@@ -141,7 +141,7 @@ if [[ ! -d $(brew --prefix cask) ]]; then
     fi
 fi
 
-if ! hash powershell 2>/dev/null; then
+if ! hash pwsh 2>/dev/null; then
     echo "Installing PowerShell..."
     if ! brew cask install powershell; then
         echo "ERROR: PowerShell failed to install! Cannot install powershell..." >&2
@@ -165,7 +165,7 @@ if [[ "'$*'" =~ includeide ]] ; then
     code --install-extension ms-vscode.PowerShell
 fi
 
-powershell -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
 success=$?
 
 if [[ "$success" != 0 ]]; then
diff --git a/tools/installpsh-redhat.sh b/tools/installpsh-redhat.sh
index cc70d18d33..40e29844d1 100755
--- a/tools/installpsh-redhat.sh
+++ b/tools/installpsh-redhat.sh
@@ -129,7 +129,7 @@ echo "*** Setting up PowerShell Core repo..."
 $SUDO curl https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/microsoft.repo
 $SUDO yum install -y powershell
 
-powershell -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
 success=$?
 
 if [[ "$success" != 0 ]]; then
diff --git a/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
index a49a7cc8f0..b7a5997182 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
+++ b/tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile
@@ -24,4 +24,4 @@ RUN yum install -y \
 COPY PowerShellPackage.ps1 /
 
 # Use PowerShell as the default shell
-ENTRYPOINT [ "powershell" ]
+ENTRYPOINT [ "pwsh" ]
diff --git a/tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile
index b27b3a331d..debdc50b07 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile
+++ b/tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile
@@ -33,4 +33,4 @@ RUN apt-get update \
 COPY PowerShellPackage.ps1 /
 
 # Use PowerShell as the default shell
-ENTRYPOINT [ "powershell" ]
+ENTRYPOINT [ "pwsh" ]
diff --git a/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
index cfd7c076e9..5c036ebab2 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
+++ b/tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile
@@ -31,4 +31,4 @@ RUN apt-get update \
 COPY PowerShellPackage.ps1 /
 
 # Use PowerShell as the default shell
-ENTRYPOINT [ "powershell" ]
+ENTRYPOINT [ "pwsh" ]
diff --git a/tools/releaseBuild/vstsbuild.sh b/tools/releaseBuild/vstsbuild.sh
index d805992aa4..d7d0363745 100644
--- a/tools/releaseBuild/vstsbuild.sh
+++ b/tools/releaseBuild/vstsbuild.sh
@@ -1 +1 @@
-powershell -command ".\vstsbuild.ps1 $*"
+pwsh -command ".\vstsbuild.ps1 $*"