Update install scripts with minor fixes targeting macOS

Fixes #4617
Fixes #4511
Change VS code install to use cask
Change OSX to use curl
Update version number by point release.
This commit is contained in:
Darwin
2017-08-22 12:10:00 -07:00
committed by Travis Plunk
parent cdbbb7a4bb
commit ece7b44de3
2 changed files with 7 additions and 3 deletions
+6 -2
View File
@@ -21,7 +21,7 @@
#gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution
VERSION="1.1.0"
VERSION="1.1.1"
gitreposubpath="PowerShell/PowerShell/master"
gitreposcriptroot="https://raw.githubusercontent.com/$gitreposubpath/tools"
gitscriptname="install-powershell.psh"
@@ -139,7 +139,11 @@ elif [ "$DistroBasedOn" == "redhat" ] || [ "$DistroBasedOn" == "debian" ] || [ "
#Script files are not local - pull from remote
echo "Could not find \"installpsh-$DistroBasedOn.sh\" next to this script..."
echo "Pulling it from \"$gitreposcriptroot/installpsh-$DistroBasedOn.sh\""
bash <(wget -qO- $gitreposcriptroot/installpsh-$DistroBasedOn.sh) $@
if [ "$OS" == "osx" ]; then
bash <(curl -s $gitreposcriptroot/installpsh-$DistroBasedOn.sh) $@
else
bash <(wget -qO- $gitreposcriptroot/installpsh-$DistroBasedOn.sh) $@
fi
fi
else
echo "Sorry, your operating system is based on $DistroBasedOn and is not supported by PowerShell Core or this installer at this time."
+1 -1
View File
@@ -154,7 +154,7 @@ fi
if [[ "'$*'" =~ includeide ]] ; then
echo "\n*** Installing VS Code PowerShell IDE..."
if [[ ! -d $(brew --prefix visual-studio-code) ]]; then
if ! brew install visual-studio-code; then
if ! brew cask install visual-studio-code; then
echo "ERROR: Visual Studio Code failed to install..." >&2
exit 1
fi