jshaver
/
goldilocks.js
forked from coolaj86/goldilocks.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

turn on set +e around if blocks

This commit is contained in:
AJ ONeal 2017-11-06 18:30:41 -07:00
parent 55f81ca1b6
commit 5c7a5c0b2e
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@ -96,12 +96,14 @@ popd
# #
source ./installer/my-root.sh source ./installer/my-root.sh
echo "Pre-installation to $my_app_dir complete, now installing to $my_root/ ..." echo "Pre-installation to $my_app_dir complete, now installing to $my_root/ ..."
set +e
if type -p tree >/dev/null 2>/dev/null; then if type -p tree >/dev/null 2>/dev/null; then
#tree -I "node_modules|include|share" $my_app_dir #tree -I "node_modules|include|share" $my_app_dir
tree -L 6 -I "include|share|npm" $my_app_dir tree -L 6 -I "include|share|npm" $my_app_dir
else else
ls $my_app_dir ls $my_app_dir
fi fi
set -e
source ./installer/my-user-my-group.sh source ./installer/my-user-my-group.sh
echo "User $my_user Group $my_group" echo "User $my_user Group $my_group"

2
installer/http-get.sh
View File

@ -13,6 +13,7 @@ _h_http_out=""
detect_http_get() detect_http_get()
{ {
set +e
if type -p curl >/dev/null 2>&1; then if type -p curl >/dev/null 2>&1; then
_h_http_get="curl" _h_http_get="curl"
_h_http_opts="-fsSL" _h_http_opts="-fsSL"
@ -25,6 +26,7 @@ detect_http_get()
echo "Aborted, could not find curl or wget" echo "Aborted, could not find curl or wget"
return 7 return 7
fi fi
set -e
} }
http_get() http_get()

2
installer/sudo-cmd.sh
View File

@ -1,5 +1,7 @@
# Not every platform has or needs sudo, gotta save them O(1)s... # Not every platform has or needs sudo, gotta save them O(1)s...
sudo_cmd="" sudo_cmd=""
set +e
if type -p sudo >/dev/null 2>/dev/null; then if type -p sudo >/dev/null 2>/dev/null; then
((EUID)) && [[ -z "${ANDROID_ROOT-}" ]] && sudo_cmd="sudo" ((EUID)) && [[ -z "${ANDROID_ROOT-}" ]] && sudo_cmd="sudo"
fi fi
set -e