From a543161d427e468af7abac7edf2fec1f0bc72511 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 2 Jun 2017 14:17:27 -0700 Subject: [PATCH] Update docs for beta.2 release (#3922) --- README.md | 16 +++---- appveyor.yml | 2 +- docker/release/fedora24/Dockerfile | 6 +-- docker/release/nanoserver/Dockerfile | 2 +- docker/release/opensuse42.1/Dockerfile | 4 +- docker/release/windowsservercore/Dockerfile | 2 +- docs/installation/linux.md | 48 ++++++++++----------- tools/download.sh | 12 +++--- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index a9bcaaa008..c9b668e6f5 100644 --- a/README.md +++ b/README.md @@ -35,16 +35,16 @@ You can download and install a PowerShell package for any of the following platf | macOS 10.12 | [.pkg][rl-macos] | [Instructions][in-macos] | | Docker | | [Instructions][in-docker] | -[rl-windows10]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win10-win2016-x64.msi -[rl-windows81]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win81-win2012r2-x64.msi +[rl-windows10]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/PowerShell-6.0.0-beta.2-win10-win2016-x64.msi +[rl-windows81]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/PowerShell-6.0.0-beta.2-win81-win2012r2-x64.msi [rl-windows7-64]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win7-win2008r2-x64.msi [rl-windows7-86]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-alpha.18/PowerShell-6.0.0-alpha.18-win7-x86.msi -[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb -[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb -[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm -[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-x86_64.AppImage -[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0-beta.1-osx.10.12-x64.pkg -[rl-opensuse421]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm +[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell_6.0.0-beta.2-1ubuntu1.16.04.1_amd64.deb +[rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell_6.0.0-beta.2-1ubuntu1.14.04.1_amd64.deb +[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell-6.0.0_beta.2-1.el7.x86_64.rpm +[rl-ai]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/PowerShell-6.0.0-beta.2-x86_64.AppImage +[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell-6.0.0-beta.2-osx.10.12-x64.pkg +[rl-opensuse421]: https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell-6.0.0_beta.2-1.suse.42.1.x86_64.rpm [installation]: docs/installation [in-windows]: docs/installation/windows.md#msi diff --git a/appveyor.yml b/appveyor.yml index fcfbc58ce5..12fe698e01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 6.0.0-beta.1-{build} +version: 6.0.0-beta.2-{build} image: Visual Studio 2015 diff --git a/docker/release/fedora24/Dockerfile b/docker/release/fedora24/Dockerfile index a8821151ee..66d2cf65ee 100644 --- a/docker/release/fedora24/Dockerfile +++ b/docker/release/fedora24/Dockerfile @@ -6,9 +6,9 @@ LABEL description="This Dockerfile will install the latest release of PS." # TODO: Until a release of PowerShell for Fedora 24 is available, # this Dockerfile installs the CentOS 7 version for compatibility. -ARG POWERSHELL_VERSION=6.0.0-beta.1 -ARG POWERSHELL_RELEASE=v6.0.0-beta.1 -ARG POWERSHELL_PACKAGE=powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm +ARG POWERSHELL_VERSION=6.0.0-beta.2 +ARG POWERSHELL_RELEASE=v6.0.0-beta.2 +ARG POWERSHELL_PACKAGE=powershell-6.0.0_beta.2-1.el7.x86_64.rpm # The CentOS 7 release relies on an older version of libicu, so we'll be downloading it # from the University of Kent (GB) mirror service. diff --git a/docker/release/nanoserver/Dockerfile b/docker/release/nanoserver/Dockerfile index 6887ddb036..fa6039050d 100644 --- a/docker/release/nanoserver/Dockerfile +++ b/docker/release/nanoserver/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="PowerShell Team " LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" LABEL description="This Dockerfile will install the latest release of PS." -ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win10-win2016-x64.zip +ARG POWERSHELL_ZIP=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/PowerShell-6.0.0-beta.2-win10-win2016-x64.zip # Setup PowerShell - Log-to > C:\Docker.log SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] diff --git a/docker/release/opensuse42.1/Dockerfile b/docker/release/opensuse42.1/Dockerfile index 95ed2ec65a..7b3a2e7ad5 100644 --- a/docker/release/opensuse42.1/Dockerfile +++ b/docker/release/opensuse42.1/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="PowerShell Team " LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" LABEL description="This Dockerfile will install the latest release of PS." -ARG POWERSHELL_VERSION=6.0.0_beta.1 -ARG POWERSHELL_RELEASE=v6.0.0-beta.1 +ARG POWERSHELL_VERSION=6.0.0_beta.2 +ARG POWERSHELL_RELEASE=v6.0.0-beta.2 ARG FORK=PowerShell ARG POWERSHELL_PACKAGE=powershell-$POWERSHELL_VERSION-1.suse.42.1.x86_64.rpm diff --git a/docker/release/windowsservercore/Dockerfile b/docker/release/windowsservercore/Dockerfile index 8ab937a64e..ffb1b21cd8 100644 --- a/docker/release/windowsservercore/Dockerfile +++ b/docker/release/windowsservercore/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="PowerShell Team " LABEL readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" LABEL description="This Dockerfile will install the latest release of PS." -ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/PowerShell-6.0.0-beta.1-win10-win2016-x64.msi +ARG POWERSHELL_MSI=https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/PowerShell-6.0.0-beta.2-win10-win2016-x64.msi # Setup PowerShell - Log-to > C:\Docker.log SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"] diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 6b6f094dae..ffc67e1d5d 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -10,7 +10,7 @@ You should *never* run a script without reading it first! Please **read the [download][] script first**, and then if you want to run it, use: ```sh -bash <(curl -fsSL https://raw.githubusercontent.com/PowerShell/PowerShell/v6.0.0-beta.1/tools/download.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/download.sh) ``` Once the package is installed, run `powershell` from a terminal. @@ -23,7 +23,7 @@ Once the package is installed, run `powershell` from a terminal. [arch]: #arch-linux [lai]: #linux-appimage [mac]: #macos-1012 -[download]: https://github.com/PowerShell/PowerShell/blob/v6.0.0-beta.1/tools/download.sh +[download]: https://github.com/PowerShell/PowerShell/blob/master/tools/download.sh ## Ubuntu 14.04 @@ -55,13 +55,13 @@ from then on, you just need to use `sudo apt-get upgrade powershell` to update i ### Installation via Direct Download Using [Ubuntu 14.04][], download the Debian package -`powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb` +`powershell_6.0.0-beta.2-1ubuntu1.14.04.1_amd64.deb` from the [releases][] page onto the Ubuntu machine. Then execute the following in the terminal: ```sh -sudo dpkg -i powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb +sudo dpkg -i powershell_6.0.0-beta.2-1ubuntu1.14.04.1_amd64.deb sudo apt-get install -f ``` @@ -107,13 +107,13 @@ from then on, you just need to use `sudo apt-get upgrade powershell` to update i ### Installation via Direct Download - Ubuntu 16.04 Using [Ubuntu 16.04][], download the Debian package -`powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb` +`powershell_6.0.0-beta.2-1ubuntu1.16.04.1_amd64.deb` from the [releases][] page onto the Ubuntu machine. Then execute the following in the terminal: ```sh -sudo dpkg -i powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb +sudo dpkg -i powershell_6.0.0-beta.2-1ubuntu1.16.04.1_amd64.deb sudo apt-get install -f ``` @@ -160,13 +160,13 @@ from then on, you just need to use `sudo apt-get upgrade powershell` to update i ### Installation via Direct Download - Debian 8 Download the Debian package -`powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb` +`powershell_6.0.0-beta.2-1ubuntu1.14.04.1_amd64.deb` from the [releases][] page onto the Debian machine. Then execute the following in the terminal: ```sh -sudo dpkg -i powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb +sudo dpkg -i powershell_6.0.0-beta.2-1ubuntu1.14.04.1_amd64.deb sudo apt-get install -f ``` @@ -205,19 +205,19 @@ you just need to use `sudo yum update powershell` to update PowerShell. ### Installation via Direct Download - CentOS 7 Using [CentOS 7][], download the RPM package -`powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm` +`powershell-6.0.0_beta.2-1.el7.x86_64.rpm` from the [releases][] page onto the CentOS machine. Then execute the following in the terminal: ```sh -sudo yum install ./powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm +sudo yum install ./powershell-6.0.0_beta.2-1.el7.x86_64.rpm ``` You can also install the RPM without the intermediate step of downloading it: ```sh -sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm +sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell-6.0.0_beta.2-1.el7.x86_64.rpm ``` ### Uninstallation - CentOS 7 @@ -251,19 +251,19 @@ you just need to use `sudo yum update powershell` to update PowerShell. ### Installation via Direct Download - Red Hat Enterprise Linux (RHEL) 7 Download the RPM package -`powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm` +`powershell-6.0.0_beta.2-1.el7.x86_64.rpm` from the [releases][] page onto the Red Hat Enterprise Linux machine. Then execute the following in the terminal: ```sh -sudo yum install ./powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm +sudo yum install ./powershell-6.0.0_beta.2-1.el7.x86_64.rpm ``` You can also install the RPM without the intermediate step of downloading it: ```sh -sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm +sudo yum install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell-6.0.0_beta.2-1.el7.x86_64.rpm ``` ### Uninstallation - Red Hat Enterprise Linux (RHEL) 7 @@ -279,21 +279,21 @@ Installation instruction for OpenSUSE 42.1. ### Installation via Direct Download - OpenSUSE 42.1 Using [OpenSUSE 42.1][], download the RPM package -`powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm` +`powershell-6.0.0_beta.2-1.suse.42.1.x86_64.rpm` from the [releases][] page onto the OpenSUSE machine. Then execute the following in the terminal: ```sh sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc -sudo zypper install ./powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm +sudo zypper install ./powershell-6.0.0_beta.2-1.suse.42.1.x86_64.rpm ``` You can also install the RPM without the intermediate step of downloading it: ```sh sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc -sudo zypper install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.1/powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm +sudo zypper install https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.2/powershell-6.0.0_beta.2-1.suse.42.1.x86_64.rpm ``` ### Uninstallation - OpenSUSE 42.1 @@ -319,14 +319,14 @@ For more information on installing packages from the AUR, see the [Arch Linux wi ## Linux AppImage Using a recent Linux distribution, -download the AppImage `PowerShell-6.0.0-beta.1-x86_64.AppImage` +download the AppImage `PowerShell-6.0.0-beta.2-x86_64.AppImage` from the [releases][] page onto the Linux machine. Then execute the following in the terminal: ```bash -chmod a+x PowerShell-6.0.0-beta.1-x86_64.AppImage -./PowerShell-6.0.0-beta.1-x86_64.AppImage +chmod a+x PowerShell-6.0.0-beta.2-x86_64.AppImage +./PowerShell-6.0.0-beta.2-x86_64.AppImage ``` The [AppImage][] lets you run PowerShell without installing it. @@ -340,14 +340,14 @@ and is a single binary. ## macOS 10.12 Using macOS 10.12, download the PKG package -`powershell-6.0.0-beta.1-osx.10.12-x64.pkg` +`powershell-6.0.0-beta.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-beta.1-osx.10.12-x64.pkg -target / +sudo installer -pkg powershell-6.0.0-beta.2-osx.10.12-x64.pkg -target / ``` ### Uninstallation - macOS 10.12 @@ -412,7 +412,7 @@ You *can* run this command manually if you're having trouble with .NET Core's cr ## Paths -* `$PSHOME` is `/opt/microsoft/powershell/6.0.0-beta.1/` +* `$PSHOME` is `/opt/microsoft/powershell/6.0.0-beta.2/` * User profiles will be read from `~/.config/powershell/profile.ps1` * Default profiles will be read from `$PSHOME/profile.ps1` * User modules will be read from `~/.local/share/powershell/Modules` @@ -427,7 +427,7 @@ On Linux and macOS, the [XDG Base Directory Specification][xdg-bds] is respected Note that because macOS is a derivation of BSD, instead of `/opt`, the prefix used is `/usr/local`. -Thus, `$PSHOME` is `/usr/local/microsoft/powershell/6.0.0-beta.1/`, +Thus, `$PSHOME` is `/usr/local/microsoft/powershell/6.0.0-beta.2/`, and the symlink is placed at `/usr/local/bin/powershell`. [releases]: https://github.com/PowerShell/PowerShell/releases/latest diff --git a/tools/download.sh b/tools/download.sh index fb0023a8b4..2e950c5350 100755 --- a/tools/download.sh +++ b/tools/download.sh @@ -9,7 +9,7 @@ trap ' get_url() { fork=$2 - release=v6.0.0-beta.1 + release=v6.0.0-beta.2 echo "https://github.com/$fork/PowerShell/releases/download/$release/$1" } @@ -26,7 +26,7 @@ case "$OSTYPE" in sudo yum install -y curl fi - package=powershell-6.0.0_beta.1-1.el7.centos.x86_64.rpm + package=powershell-6.0.0_beta.2-1.el7.x86_64.rpm ;; ubuntu) if ! hash curl 2>/dev/null; then @@ -36,10 +36,10 @@ case "$OSTYPE" in case "$VERSION_ID" in 14.04) - package=powershell_6.0.0-beta.1-1ubuntu1.14.04.1_amd64.deb + package=powershell_6.0.0-beta.2-1ubuntu1.14.04.1_amd64.deb ;; 16.04) - package=powershell_6.0.0-beta.1-1ubuntu1.16.04.1_amd64.deb + package=powershell_6.0.0-beta.2-1ubuntu1.16.04.1_amd64.deb ;; *) echo "Ubuntu $VERSION_ID is not supported!" >&2 @@ -55,7 +55,7 @@ case "$OSTYPE" in case "$VERSION_ID" in 42.1) - package=powershell-6.0.0_beta.1-1.suse.42.1.x86_64.rpm + package=powershell-6.0.0_beta.2-1.suse.42.1.x86_64.rpm ;; *) echo "OpenSUSE $VERSION_ID is not supported!" >&2 @@ -69,7 +69,7 @@ case "$OSTYPE" in ;; darwin*) # We don't check for curl as macOS should have a system version - package=powershell-6.0.0-beta.1-osx.10.12-x64.pkg + package=powershell-6.0.0-beta.2-osx.10.12-x64.pkg ;; *) echo "$OSTYPE is not supported!" >&2