GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Fix some output strings (#5065) · PowerShell/PowerShell@9d5823b

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

.travis.yml
tools
- installpsh-osx.sh

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎.travis.yml‎`

Copy file name to clipboardExpand all lines: .travis.yml

+6-3Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,15 @@ addons:`
`20`	`20`	`- pester-tests.xml`
`21`	`21`
`22`	`22`	`install:`
	`23`	`+ # Default 2.0.0 Ruby is buggy`
	`24`	`+ # Default bundler version is buggy`
	`25`	`+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then`
	`26`	`+ rvm install ruby-2.3.3;`
	`27`	`+ rvm --default use 2.3.3;`
	`28`	`+ fi`
`23`	`29`	`- pushd tools`
`24`	`30`	`- ./install-powershell.sh`
`25`	`31`	`- popd`
`26`		`- # Default 2.0.0 Ruby is buggy`
`27`		`- # Default bundler version is buggy`
`28`		`- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm install ruby-2.3.1; rvm use 2.3.1; fi`
`29`	`32`	`# spellcheck`
`30`	`33`	`- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then`
`31`	`34`	`nvm install 6.4.0 &&`

Collapse file

`‎tools/installpsh-osx.sh‎`

Copy file name to clipboardExpand all lines: tools/installpsh-osx.sh

+19-20Lines changed: 19 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ thisinstallerdistro=osx`
`25`	`25`	`repobased=true`
`26`	`26`	`gitscriptname="installpsh-osx.sh"`
`27`	`27`
`28`		`-echo "\n*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro"`
	`28`	`+echo "*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro"`
`29`	`29`	`echo "*** Current PowerShell Core Version: $currentpshversion"`
`30`	`30`	`echo "*** Original script is at: $gitreposcriptroot/$gitscriptname"`
`31`		`-echo "\n*** Arguments used: $* \n\n"`
	`31`	`+echo "*** Arguments used: $*"`
`32`	`32`
`33`	`33`	`# Let's quit on interrupt of subcommands`
`34`	`34`	`trap '`
`@@ -93,14 +93,13 @@ if (( $EUID != 0 )); then`
`93`	`93`	`fi`
`94`	`94`
`95`	`95`	`#Check that sudo is available`
`96`		`-if [[ "$SUDO" -eq "sudo" ]]; then`
`97`		`-`
`98`		`- $SUDO -v`
`99`		`- if [ $? -ne 0]; then`
`100`		`- echo "ERROR: You must either be root or be able to use sudo" >&2`
`101`		`- exit 5`
`102`		`- fi`
`103`		`-fi`
	`96`	`+#if [[ "$SUDO" -eq "sudo" ]]; then`
	`97`	`+# $SUDO -v`
	`98`	`+# if [ $? -ne 0 ]; then`
	`99`	`+# echo "ERROR: You must either be root or be able to use sudo" >&2`
	`100`	`+# exit 5`
	`101`	`+# fi`
	`102`	`+#fi`
`104`	`103`
`105`	`104`	`#END Collect any variation details if required for this distro`
`106`	`105`
`@@ -110,7 +109,7 @@ fi`
`110`	`109`
`111`	`110`	`##END Check requirements and prerequisites`
`112`	`111`
`113`		`-echo "\n*** Installing PowerShell Core for $DistroBasedOn..."`
	`112`	`+echo "*** Installing PowerShell Core for $DistroBasedOn..."`
`114`	`113`
`115`	`114`	#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`
`116`	`115`
`@@ -126,6 +125,13 @@ if ! hash brew 2>/dev/null; then`
`126`	`125`	`exit 3`
`127`	`126`	`fi`
`128`	`127`
	`128`	`+# Suppress output, it's very noisy on travis-ci`
	`129`	`+echo "Refreshing Homebrew cache..."`
	`130`	`+if ! brew update > /dev/null; then`
	`131`	`+ echo "ERROR: Refreshing Homebrew cache failed..." >&2`
	`132`	`+ exit 2`
	`133`	`+fi`
	`134`	`+`
`129`	`135`	`# Suppress output, it's very noisy on travis-ci`
`130`	`136`	`if [[ ! -d $(brew --prefix cask) ]]; then`
`131`	`137`	`echo "Installing cask..."`
`@@ -135,13 +141,6 @@ if [[ ! -d $(brew --prefix cask) ]]; then`
`135`	`141`	`fi`
`136`	`142`	`fi`
`137`	`143`
`138`		`-# Suppress output, it's very noisy on travis-ci`
`139`		`-echo "Refreshing Homebrew cache..."`
`140`		`-if ! brew update >/dev/null; then`
`141`		`- echo "ERROR: Refreshing Homebrew cache failed..." >&2`
`142`		`- exit 2`
`143`		`-fi`
`144`		`-`
`145`	`144`	`if ! hash powershell 2>/dev/null; then`
`146`	`145`	`echo "Installing PowerShell..."`
`147`	`146`	`if ! brew cask install powershell; then`
`@@ -152,7 +151,7 @@ else`
`152`	`151`	`fi`
`153`	`152`
`154`	`153`	`if [[ "'$*'" =~ includeide ]] ; then`
`155`		`- echo "\n*** Installing VS Code PowerShell IDE..."`
	`154`	`+ echo "*** Installing VS Code PowerShell IDE..."`
`156`	`155`	`if [[ ! -d $(brew --prefix visual-studio-code) ]]; then`
`157`	`156`	`if ! brew cask install visual-studio-code; then`
`158`	`157`	`echo "ERROR: Visual Studio Code failed to install..." >&2`
`@@ -162,7 +161,7 @@ if [[ "'$*'" =~ includeide ]] ; then`
`162`	`161`	`brew upgrade visual-studio-code`
`163`	`162`	`fi`
`164`	`163`
`165`		`- echo "\n*** Installing VS Code PowerShell Extension"`
	`164`	`+ echo "*** Installing VS Code PowerShell Extension"`
`166`	`165`	`code --install-extension ms-vscode.PowerShell`
`167`	`166`	`fi`
`168`	`167`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.