slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install: be better and finding stack when just installed and not in PATH

Browse Source
This commit is contained in:
Simon Michael 2017-09-03 11:29:01 -07:00
parent ddb67c0c0b
commit 84b5340762
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hledger-install/hledger-install.sh
View File

@ -522,7 +522,9 @@ install_from_bindist() {
echo "Stack has been installed to: $HOME_LOCAL_BIN/stack" echo "Stack has been installed to: $HOME_LOCAL_BIN/stack"
info "" info ""
check_usr_local_bin_on_path #CHANGED
# check_usr_local_bin_on_path
ensure_home_local_bin_on_path
} }
install_arm_binary() { install_arm_binary() {
@ -690,6 +692,16 @@ check_home_local_bin_on_path() {
fi fi
} }
# If ~/.local/bin is not on the PATH, print a warning and add it temporarily.
ensure_home_local_bin_on_path() {
if ! on_path "$HOME_LOCAL_BIN" ; then
info "WARNING: '$HOME_LOCAL_BIN' is not on your PATH; adding it temporarily."
info " For best results, please add it to the beginning of PATH in your profile."
info ""
PATH=$HOME_LOCAL_BIN:$PATH
fi
}
# Check whether /usr/local/bin is on the PATH, and print a warning if not. # Check whether /usr/local/bin is on the PATH, and print a warning if not.
check_usr_local_bin_on_path() { check_usr_local_bin_on_path() {
if ! on_path "$USR_LOCAL_BIN" ; then if ! on_path "$USR_LOCAL_BIN" ; then
@ -719,6 +731,7 @@ ensure_stack() {
if ! $(has_stack) || [[ "$FORCE" == "true" ]] ; then if ! $(has_stack) || [[ "$FORCE" == "true" ]] ; then
echo "Installing stack" echo "Installing stack"
do_os do_os
# after installing stack, it will
fi fi
} }