Update 'installpsh-suse.sh' and remove 'download.sh' (PowerShell#5309)

daxian-dbw · web-flow · commit da5a1a60154c · 2017-11-03T08:47:26.000-07:00
- Update `installpsh-suse.sh` to work with the .tar.gz binary archive.
- Remove `download.sh` as it's not used anywhere now. (checked with PowerShellGet and OneGet, they are using a local copy of download.sh).
diff --git a/.spelling b/.spelling
@@ -406,11 +406,6 @@ u
  - demos/DSC/readme.md
 #endregion
 
-#region demos/install/README.md Overrides
- - demos/install/README.md
-download.sh
-#endregion
-
 #region demos/python/README.md Overrides
  - demos/python/README.md
 _script.ps1
diff --git a/demos/install/README.md b/demos/install/README.md
@@ -1,5 +1,5 @@
-﻿## Install demo
+﻿# Install demo
 
-For Windows refer to the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/installation/windows.md)
+For Windows refer to the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/installation/windows.md).
 
-For Linux, using [download.sh](https://github.com/PowerShell/PowerShell/blob/master/tools/download.sh) is the best way to deploy PowerShell bits
+For Linux, using [`install-powershell.sh`](https://github.com/PowerShell/PowerShell/blob/master/tools/install-powershell-readme.md) is the best way to deploy PowerShell bits.
diff --git a/docs/building/linux.md b/docs/building/linux.md
@@ -25,7 +25,7 @@ Installing the toolchain is as easy as running `Start-PSBootstrap` in PowerShell
 Of course, this requires a self-hosted copy of PowerShell on Linux.
 
 Fortunately, this is as easy as [downloading and installing the package](../installation/linux.md).
-The `./tools/download.sh` script will also install the PowerShell package.
+The `./tools/install-powershell.sh` script will also install the PowerShell package.
 
 In Bash:
 
diff --git a/tools/download.sh b/tools/download.sh
diff --git a/tools/installpsh-debian.sh b/tools/installpsh-debian.sh
@@ -132,7 +132,9 @@ $SUDO apt-get update
 # Install PowerShell
 $SUDO apt-get install -y powershell
 
-pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME.
+Run `"pwsh`" to start a PowerShell session."'
+
 success=$?
 
 if [[ "$success" != 0 ]]; then
diff --git a/tools/installpsh-osx.sh b/tools/installpsh-osx.sh
@@ -165,7 +165,9 @@ if [[ "'$*'" =~ includeide ]] ; then
     code --install-extension ms-vscode.PowerShell
 fi
 
-pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME.
+Run `"pwsh`" to start a PowerShell session."'
+
 success=$?
 
 if [[ "$success" != 0 ]]; then
diff --git a/tools/installpsh-redhat.sh b/tools/installpsh-redhat.sh
@@ -129,7 +129,9 @@ 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
 
-pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME.
+Run `"pwsh`" to start a PowerShell session."'
+
 success=$?
 
 if [[ "$success" != 0 ]]; then
diff --git a/tools/installpsh-suse.sh b/tools/installpsh-suse.sh
@@ -22,7 +22,7 @@ VERSION="1.1.2"
 gitreposubpath="PowerShell/PowerShell/master"
 gitreposcriptroot="https://raw.githubusercontent.com/$gitreposubpath/tools"
 thisinstallerdistro=suse
-repobased=true
+repobased=false
 gitscriptname="installpsh-suse.psh"
 
 echo
@@ -116,15 +116,22 @@ fi
 
 #END Verify The Installer Choice
 
+echo
+echo "*** Installing prerequisites for PowerShell Core..."
+$SUDO zypper --non-interactive install \
+        glibc-locale \
+        glibc-i18ndata \
+        tar \
+        curl \
+        libunwind \
+        libicu \
+        openssl \
+    && zypper --non-interactive clean --all
 
 ##END Check requirements and prerequisites
 
 echo
 echo "*** Installing PowerShell Core for $DistroBasedOn..."
-if ! hash curl 2>/dev/null; then
-    echo "curl not found, installing..."
-    $SUDO zypper install -y curl
-fi
 release=`curl https://api.github.com/repos/powershell/powershell/releases/latest | sed '/tag_name/!d' | sed s/\"tag_name\"://g | sed s/\"//g | sed s/v//g | sed s/,//g | sed s/\ //g`
 
 #REPO BASED (Not ready yet)
@@ -140,8 +147,8 @@ release=`curl https://api.github.com/repos/powershell/powershell/releases/latest
 #$SUDO zypper --non-interactive install powershell
 
 #DIRECT DOWNLOAD
-packagerel=`echo $release | sed 's/-/_/'`
-package=powershell-${packagerel}-1.suse.42.1.x86_64.rpm
+pwshlink=/usr/bin/pwsh
+package=powershell-${release}-linux-x64.tar.gz
 downloadurl=https://github.com/PowerShell/PowerShell/releases/download/v$release/$package
 
 echo "Destination file: $package"
@@ -154,10 +161,29 @@ if [[ ! -r "$package" ]]; then
     exit 1
 fi
 
-sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
-sudo zypper --non-interactive install "./$package"
+## Create the target folder where powershell will be placed
+$SUDO mkdir -p /opt/microsoft/powershell/$release
+## Expand powershell to the target folder
+$SUDO tar zxf $package -C /opt/microsoft/powershell/$release
+
+## Change the mode of 'pwsh' to 'rwxr-xr-x' to allow execution
+$SUDO chmod 755 /opt/microsoft/powershell/$release/pwsh
+## Create the symbolic link that points to powershell
+$SUDO ln -s /opt/microsoft/powershell/$release/pwsh $pwshlink
+
+## Add the symbolic link path to /etc/shells
+if [ ! -f /etc/shells ] ; then
+    echo $pwshlink | $SUDO tee /etc/shells ;
+else
+    grep -q "^${pwshlink}$" /etc/shells || echo $pwshlink | $SUDO tee --append /etc/shells > /dev/null ;
+fi
+
+## Remove the downloaded package file
+rm -f $package
+
+pwsh -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME.
+Run `"pwsh`" to start a PowerShell session."'
 
-powershell -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
 success=$?
 
 if [[ "$success" != 0 ]]; then
