Skip to content

Commit

Permalink
Merge pull request #3 from damncabbage/topic/bootstrap-fixes
Browse files Browse the repository at this point in the history
Bootstrap fixes.
  • Loading branch information
damncabbage committed Apr 29, 2016
2 parents 1aba597 + 0c085d8 commit 0d71437
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions bootstrap.sh
Expand Up @@ -33,7 +33,7 @@ function installNodeMac() {
echo -e "\nCan't find a version of Node available on Homebrew matching ${NODE_VERSION_REGEX} - you may need to update your local formula cache by running:\n brew update\n"
exit 1
fi
"$HOMEBREW" install node # v4+, including 5
"$HOMEBREW" install homebrew/versions/node4-lts # v4-6
fi
}

Expand Down Expand Up @@ -67,7 +67,7 @@ if [ "$NODE_CODE" -eq 0 ]; then
if [ "$(echo "$NODE_VERSION" | grep -c "^v${NODE_VERSION_REGEX}")" -eq 1 ]; then
echo "*** Node.js ${NODE_VERSION} already installed."
else
echo "*** Node.js already installed, but expected version matching ${NODE_REGEX} - found ${NODE_VERSION} instead."
echo "*** Node.js already installed, but expected version matching ${NODE_VERSION_REGEX} - found ${NODE_VERSION} instead."
exit 1
fi
else
Expand Down Expand Up @@ -97,8 +97,8 @@ else
fi

# psc, pulp and some editor tools
if prompt "install purescript@0.8.5 pulp purescript-psa and pscid globally with npm install -g"; then
npm install -g purescript@0.8.5 pulp purescript-psa pscid
if prompt "install purescript@0.8.5 bower pulp purescript-psa and pscid globally with npm install -g"; then
npm install -g purescript@0.8.5 bower pulp purescript-psa pscid
fi

# bower installs
Expand Down

0 comments on commit 0d71437

Please sign in to comment.