turn on set +e around if blocks
This commit is contained in:
parent
55f81ca1b6
commit
5c7a5c0b2e
|
@ -96,12 +96,14 @@ popd
|
|||
#
|
||||
source ./installer/my-root.sh
|
||||
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
|
||||
#tree -I "node_modules|include|share" $my_app_dir
|
||||
tree -L 6 -I "include|share|npm" $my_app_dir
|
||||
else
|
||||
ls $my_app_dir
|
||||
fi
|
||||
set -e
|
||||
|
||||
source ./installer/my-user-my-group.sh
|
||||
echo "User $my_user Group $my_group"
|
||||
|
|
|
@ -13,6 +13,7 @@ _h_http_out=""
|
|||
|
||||
detect_http_get()
|
||||
{
|
||||
set +e
|
||||
if type -p curl >/dev/null 2>&1; then
|
||||
_h_http_get="curl"
|
||||
_h_http_opts="-fsSL"
|
||||
|
@ -25,6 +26,7 @@ detect_http_get()
|
|||
echo "Aborted, could not find curl or wget"
|
||||
return 7
|
||||
fi
|
||||
set -e
|
||||
}
|
||||
|
||||
http_get()
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
# Not every platform has or needs sudo, gotta save them O(1)s...
|
||||
sudo_cmd=""
|
||||
set +e
|
||||
if type -p sudo >/dev/null 2>/dev/null; then
|
||||
((EUID)) && [[ -z "${ANDROID_ROOT-}" ]] && sudo_cmd="sudo"
|
||||
fi
|
||||
set -e
|
||||
|
|
Loading…
Reference in New Issue