Merge pull request +12074 from c9/b9-fix

Fix which error when either node or nodejs is missing
pull/248/head
Fabian Jakobs 2016-02-08 13:40:33 +01:00
commit 99eb3d95c0
2 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -22,7 +22,7 @@ _b9_init_nodejs() {
local NODEJS
. ~/.nvm/nvm.sh &> /dev/null || :
for NODEJS in $(which node) $(which nodejs) /usr/local/bin/node /usr/bin/nodejs; do
for NODEJS in $(which node 2>/dev/null) $(which nodejs 2>/dev/null) /usr/local/bin/node /usr/bin/nodejs; do
[ -x $NODEJS ] && break
NODEJS=""
done
@ -62,4 +62,4 @@ _b9_init_node_helper() {
rm -rf node_modules
$NPM install
popd &> /dev/null
}
}

Wyświetl plik

@ -8,7 +8,7 @@ _b9_dockerize_update_base() {
local VERSION
# build package
local TMPFILE=$(tempfile)
local TMPFILE=$(mktemp)
b9_package $TREEISH --type=newclient | tee $TMPFILE
VERSION=$(cat $TMPFILE | tail -n1)
rm $TMPFILE
@ -71,4 +71,4 @@ _b9_dockerize_has_tag() {
local TAG=$2
gsutil ls $B9_DOCKER_BUCKET/containers/repositories/library/${REPO}/tag_${TAG}
}
}