Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

chore(install): fix install scripts & improve local usage #2041

Merged
merged 1 commit into from
Aug 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions scripts/before-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

set -e -o pipefail

./scripts/env-info-and-check.sh
[[ -z "$NGIO_ENV_DEFS" ]] && . ./scripts/env-set.sh
[[ -n "$TRAVIS" ]] && . ./scripts/env-info-and-check.sh

if [[ 0 ]]; then
# Doesn't seem to be necessary. Disabling.
travis_fold start install.globals
if [ -z "$TRAVIS" ]; then
set -x
npm install -g gulp --no-optional
set +x
travis_fold end install.globals
fi
4 changes: 3 additions & 1 deletion scripts/env-info-and-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -e -o pipefail

[[ -z "$NGIO_ENV_DEFS" ]] && . ./scripts/env-set.sh

travis_fold start env_info
echo ENVIRONMENT INFO
travis_fold start env_info.path
Expand All @@ -11,7 +13,7 @@ echo
travis_fold end env_info.path
travis_fold start env_info.home
echo Home: $HOME
ls ~ -la
ls -la ~
echo
travis_fold end env_info.home
travis_fold start env_info.pwd
Expand Down
4 changes: 2 additions & 2 deletions scripts/env-set.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [[ -z "$NGIO_ENV_DEFS" ]]; then
export ANSI_YELLOW="\033[33;1m"
export ANSI_RESET="\033[0m"
echo -e "${ANSI_YELLOW}Setting environment variables from scripts/env.sh${ANSI_RESET}"
echo -e "${ANSI_YELLOW}Setting environment variables from scripts/env-set.sh${ANSI_RESET} "

export NGIO_ENV_DEFS=1

Expand All @@ -12,7 +12,7 @@ if [[ -z "$NGIO_ENV_DEFS" ]]; then

if [ ! $(type -t travis_fold) ]; then
# In case this is being run locally. Turn travis_fold into a noop.
travis_fold () { return; }
travis_fold () { true; }
# Alternative definition:
# travis_fold () { echo -en "travis_fold:${1}:${2}"; }
fi
Expand Down