From 0ed28d00f4e37b8420355ceed8aed2a139123448 Mon Sep 17 00:00:00 2001 From: Greg Zimmerman Date: Tue, 9 Jan 2018 17:55:51 -0500 Subject: [PATCH] Seperate macOS from Linux install instructions. (#5823) --- README.md | 2 +- demos/SSHRemoting/README.md | 2 +- docs/building/macos.md | 2 +- docs/installation/linux.md | 100 +---------------------------- docs/installation/macos.md | 96 +++++++++++++++++++++++++++ docs/learning-powershell/README.md | 2 +- 6 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 docs/installation/macos.md diff --git a/README.md b/README.md index d4f512c0ea..04fe7da2b6 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu [in-fedora26]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/linux.md#fedora-26 [in-archlinux]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/linux.md#arch-linux [in-appimage]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/linux.md#linux-appimage -[in-macos]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/linux.md#macos-1012 +[in-macos]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/macos.md [in-docker]: https://github.com/PowerShell/PowerShell/tree/master/docker [in-kali]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/linux.md#kali [in-windows-zip]: https://github.com/PowerShell/PowerShell/tree/master/docs/installation/windows.md#zip diff --git a/demos/SSHRemoting/README.md b/demos/SSHRemoting/README.md index 2d9f06e3f7..25f1b5e8e0 100644 --- a/demos/SSHRemoting/README.md +++ b/demos/SSHRemoting/README.md @@ -218,4 +218,4 @@ GitCommitId v6.0.0-alpha.17 [installation]: https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH [PowerShell for Linux]: https://github.com/PowerShell/PowerShell/blob/master/docs/installation/linux.md#ubuntu-1404 [Ubuntu SSH]: https://help.ubuntu.com/lts/serverguide/openssh-server.html -[PowerShell for MacOS]: https://github.com/PowerShell/PowerShell/blob/master/docs/installation/linux.md#macos-1012 +[PowerShell for MacOS]: https://github.com/PowerShell/PowerShell/blob/master/docs/installation/macos.md diff --git a/docs/building/macos.md b/docs/building/macos.md index f4760018a0..4ab0d8c7cf 100644 --- a/docs/building/macos.md +++ b/docs/building/macos.md @@ -3,7 +3,7 @@ This guide supplements the [Linux instructions](./linux.md), as building on macOS is almost identical. -.NET Core 2.0 (and by transitivity, us) only supports macOS 10.12. +.NET Core 2.0 (and by transitivity, us) only supports macOS 10.12+. ## Environment diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 6ad094b01d..989c5f553a 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -1,8 +1,8 @@ -# Package installation instructions +# Package Installation Instructions Supports [Ubuntu 14.04][u14], [Ubuntu 16.04][u16], [Ubuntu 17.04][u17], [Debian 8][deb8], [Debian 9][deb9], [CentOS 7][cos], [Red Hat Enterprise Linux (RHEL) 7][rhel7], [OpenSUSE 42.2][opensuse], [Fedora 25][fed25], -[Fedora 26][fed26], [Arch Linux][arch], and [macOS 10.12][mac]. +[Fedora 26][fed26], and [Arch Linux][arch]. For Linux distributions that are not officially supported, you can try using the [PowerShell AppImage][lai]. @@ -567,75 +567,6 @@ and is a single binary. [appimage]: http://appimage.org/ -## macOS 10.12 - -### Installation via Homebrew (preferred) - macOS 10.12 - -[Homebrew][brew] is the missing package manager for macOS. -If the `brew` command is not found, -you need to install Homebrew following [their instructions][brew]. - -Once you've installed Homebrew, installing PowerShell is easy. -First, install [Homebrew-Cask][cask], so you can install more packages: - -```sh -brew tap caskroom/cask -``` - -Now, you can install PowerShell: - -```sh -brew cask install powershell -``` - -When new versions of PowerShell are released, -simply update Homebrew's formulae and upgrade PowerShell: - -```sh -brew update -brew cask reinstall powershell -``` - -> Note: because of [this issue in Cask](https://github.com/caskroom/homebrew-cask/issues/29301), you currently have to do a reinstall to upgrade. - -[brew]: http://brew.sh/ -[cask]: https://caskroom.github.io/ - -### Installation via Direct Download - macOS 10.12 - -Using macOS 10.12, download the PKG package -`powershell-6.0.0-rc.2-osx.10.12-x64.pkg` -from the [releases][] page onto the macOS machine. - -Either double-click the file and follow the prompts, -or install it from the terminal: - -```sh -sudo installer -pkg powershell-6.0.0-rc.2-osx.10.12-x64.pkg -target / -``` - -### Uninstallation - macOS 10.12 - -If you installed PowerShell with Homebrew, uninstallation is easy: - -```sh -brew cask uninstall powershell -``` - -If you installed PowerShell via direct download, -PowerShell must be removed manually: - -```sh -sudo rm -rf /usr/local/bin/pwsh /usr/local/microsoft/powershell -``` - -To uninstall the additional PowerShell paths (such as the user profile path) -please see the [paths][paths] section below in this document -and remove the desired the paths with `sudo rm`. -(Note: this is not necessary if you installed with Homebrew.) - -[paths]:#paths - ## Kali ### Installation @@ -755,39 +686,12 @@ sudo chmod +x /usr/local/microsoft/powershell/6.0.0-rc.2/pwsh sudo ln -s /opt/microsoft/powershell/6.0.0-rc.2/pwsh /usr/bin/pwsh ``` -#### macOS - -```sh -# Download the powershell '.tar.gz' archive -curl -L -o /tmp/powershell.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0-rc.2-osx-x64.tar.gz - -# Create the target folder where powershell will be placed -sudo mkdir -p /usr/local/microsoft/powershell/6.0.0-rc.2 - -# Expand powershell to the target folder -sudo tar zxf /tmp/powershell.tar.gz -C /usr/local/microsoft/powershell/6.0.0-rc.2 - -# Set execute permissions -sudo chmod +x /usr/local/microsoft/powershell/6.0.0-rc.2/pwsh - -# Create the symbolic link that points to pwsh -sudo ln -s /usr/local/microsoft/powershell/6.0.0-rc.2/pwsh /usr/local/bin/pwsh -``` - ### Uninstallation - Binary Archives -#### Linux - ```sh sudo rm -rf /usr/bin/pwsh /opt/microsoft/powershell ``` -#### macOS - -```sh -sudo rm -rf /usr/local/bin/pwsh /usr/local/microsoft/powershell -``` - ## Paths * `$PSHOME` is `/opt/microsoft/powershell/6.0.0-rc.2/` diff --git a/docs/installation/macos.md b/docs/installation/macos.md new file mode 100644 index 0000000000..b8c1c1ad1b --- /dev/null +++ b/docs/installation/macos.md @@ -0,0 +1,96 @@ +# Package Installation Instructions + +## macOS 10.12+ + +### Installation via Homebrew (preferred) + +[Homebrew][brew] is the missing package manager for macOS. +If the `brew` command is not found, +you need to install Homebrew following [their instructions][brew]. + +Once you've installed Homebrew, installing PowerShell is easy. +First, install [Homebrew-Cask][cask], so you can install more packages: + +```sh +brew tap caskroom/cask +``` + +Now, you can install PowerShell: + +```sh +brew cask install powershell +``` + +When new versions of PowerShell are released, +simply update Homebrew's formulae and upgrade PowerShell: + +```sh +brew update +brew cask reinstall powershell +``` + +> Note: because of [this issue in Cask](https://github.com/caskroom/homebrew-cask/issues/29301), you currently have to do a reinstall to upgrade. + +[brew]: http://brew.sh/ +[cask]: https://caskroom.github.io/ + +### Installation via Direct Download + +Using macOS 10.12+, download the PKG package +`powershell-6.0.0-rc.2-osx.10.12-x64.pkg` +from the [releases][] page onto the macOS machine. + +Either double-click the file and follow the prompts, +or install it from the terminal: + +```sh +sudo installer -pkg powershell-6.0.0-rc.2-osx.10.12-x64.pkg -target / +``` + +### Installation via Binary Archive + +```sh +# Download the powershell '.tar.gz' archive +curl -L -o /tmp/powershell.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-rc.2/powershell-6.0.0-rc.2-osx-x64.tar.gz + +# Create the target folder where powershell will be placed +sudo mkdir -p /usr/local/microsoft/powershell/6.0.0-rc.2 + +# Expand powershell to the target folder +sudo tar zxf /tmp/powershell.tar.gz -C /usr/local/microsoft/powershell/6.0.0-rc.2 + +# Set execute permissions +sudo chmod +x /usr/local/microsoft/powershell/6.0.0-rc.2/pwsh + +# Create the symbolic link that points to pwsh +sudo ln -s /usr/local/microsoft/powershell/6.0.0-rc.2/pwsh /usr/local/bin/pwsh +``` + +### Uninstallation + +If you installed PowerShell with Homebrew, uninstallation is easy: + +```sh +brew cask uninstall powershell +``` + +If you installed PowerShell via direct download, +PowerShell must be removed manually: + +```sh +sudo rm -rf /usr/local/microsoft /Applications/PowerShell.app +sudo rm -f /usr/local/bin/pwsh /usr/local/share/man/man1/pwsh.1.gz +sudo pkgutil --forget com.microsoft.powershell +``` + +If you installed PowerShell via binary archive, PowerShell must be removed manually. + +```sh +sudo rm -rf /usr/local/microsoft +sudo rm -f /usr/local/bin/pwsh +``` + +To uninstall the additional PowerShell paths (such as the user profile path) +please see the [paths](linux.md#path) section below in this document +and remove the desired the paths with `sudo rm`. +(Note: this is not necessary if you installed with Homebrew.) diff --git a/docs/learning-powershell/README.md b/docs/learning-powershell/README.md index 526dffbd83..6b59e21ce8 100644 --- a/docs/learning-powershell/README.md +++ b/docs/learning-powershell/README.md @@ -31,7 +31,7 @@ At the end of this exercise, you should be able to launch the PowerShell session [inst-linux]: ../installation/linux.md [inst-win]: ../installation/windows.md -[inst-macos]: ../installation/linux.md#os-x-1011 +[inst-macos]: ../installation/macos.md Getting Started with PowerShell ----