diff --git a/install2.sh b/install2.sh index 59d3ec5..010c442 100755 --- a/install2.sh +++ b/install2.sh @@ -7,11 +7,10 @@ MAIN_TAR_GZ_URL="https://git.artcode.re/miaou/miaou-bash/archive/main.tar.gz" ## FUNCTIONS function upgrade { - source_miaou_lib self_upgrade + execute_miaou_lib self_upgrade } function install { - [[ "$UID" -ne 0 ]] && sudo -vp 'SUDO privilege required: ' MIAOU_BASH_DIR=/opt/miaou-bash export MIAOU_BASH_DIR @@ -19,7 +18,7 @@ function install { curl -sO $MAIN_TAR_GZ_URL sudo tar -xzf main.tar.gz --directory $(dirname "$MIAOU_BASH_DIR") - source_miaou_lib initiate + execute_miaou_lib initiate source /etc/profile echo "miaou-bash successfully installed" @@ -41,8 +40,8 @@ function once_installed { "$(readlink /etc/inputrc)" == "$MIAOU_BASH_DIR"/etc/inputrc ]] } -function source_miaou_lib { - . "$MIAOU_BASH_DIR"/bin/miaou-bash "$MIAOU_BASH_DIR/lib/"$1".bash" +function execute_miaou_lib { + sudo -E "$MIAOU_BASH_DIR"/bin/miaou-bash "$MIAOU_BASH_DIR/lib/"$1".bash" } ## MAIN @@ -51,4 +50,5 @@ function source_miaou_lib { set -Eeuo pipefail assert_supported_distro +[[ "$UID" -ne 0 ]] && sudo -vp 'SUDO privilege required: ' once_installed && upgrade || install