Skip to content

Commit 4f47b64

Browse files
committed
Fix docs/installation/windows.md
Also consolidate install.sh with download.sh; remove unnecessary files; create README.md in install. Ran dos2unix tool to cleanup extra carriage returns at the end of lines
1 parent 0b36b09 commit 4f47b64

5 files changed

Lines changed: 14 additions & 104 deletions

File tree

demos/install/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Install demo
2+
3+
For Windows refer to the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/installation/windows.md)
4+
5+
For Linux, using [download.sh](https://github.com/PowerShell/PowerShell/blob/master/tools/download.sh) is the best way to deploy PowerShell bits

demos/install/install.ps1

Lines changed: 0 additions & 1 deletion
This file was deleted.

demos/install/install.sh

Lines changed: 0 additions & 102 deletions
This file was deleted.

docs/installation/windows.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ There is a shortcut placed in the Start Menu upon installation.
1313
>
1414
> You can launch PowerShell via the Start Menu or `$env:ProgramFiles\PowerShell\powershell.exe`
1515
16+
> Note: On Windows 8.1 / Windows 2012R2, ensure Visual C++ Redistributable
17+
> for VS2015 is installed from [here](http://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe):
18+
1619
# Instructions to Create a Remoting Endpoint
1720

1821
Beginning with 6.0.0-alpha.9, the PowerShell package for Windows includes a WinRM plugin (pwrshplugin.dll) and an installation script (Install-PowerShellRemoting.ps1).

tools/download.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,9 @@ case "$OSTYPE" in
8888
;;
8989
esac
9090

91-
echo "Congratulations! PowerShell is now installed."
91+
powershell -noprofile -c '"Congratulations! PowerShell is installed at $PSHOME"'
92+
93+
if [[ $? != 0 ]]; then
94+
echo "ERROR! PowerShell didn't install. Check script output"
95+
exit 1
96+
fi

0 commit comments

Comments
 (0)