diff --git a/lib/install_deps.sh b/lib/install_deps.sh index fdcffe0..828023b 100644 --- a/lib/install_deps.sh +++ b/lib/install_deps.sh @@ -13,6 +13,7 @@ brew:brew update:brew upgrade:brew install:brew list --formula ${pkg} apt-get:${SUDO}apt-get update:${SUDO}apt-get upgrade -y:${SUDO}apt-get install -y:dpkg -l ${pkg} pacman:${SUDO}pacman -Syy:${SUDO}pacman -Syu --noconfirm:${SUDO}pacman -S --noconfirm --needed:pacman -Qi ${pkg} dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg} +winget:winget update:true:${SUDO}winget install:winget list ${pkg} ' local supported_pkg_mgr=() unset pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check diff --git a/main.sh b/main.sh index ba841e6..813fa98 100755 --- a/main.sh +++ b/main.sh @@ -38,7 +38,7 @@ src_scripts() { export FB_RUNNING_AS_SCRIPT=1 thisFile="$(readlink -f "$0")" export REPO_DIR="$(cd "$(dirname "${thisFile}")/.." && echo "$PWD")" -source "${REPO_DIR}/main.sh" || return 1 +source "${REPO_DIR}/main.sh" || exit 1 scr_name="$(bash_basename $0)" cmd="${scr_name//.sh/}" if [[ $DEBUG == 1 ]]; then set -x; fi @@ -71,8 +71,6 @@ set_completions() { done } -# shellcheck disable=SC1091 -test -f "${HOME}/.bashrc" && source "${HOME}/.bashrc" src_scripts || return 1 determine_pkg_mgr || return 1 check_compile_opts_override || return 1 diff --git a/scripts/entry.sh b/scripts/entry.sh index 4039c36..934f4fd 100755 --- a/scripts/entry.sh +++ b/scripts/entry.sh @@ -2,7 +2,7 @@ export FB_RUNNING_AS_SCRIPT=1 thisFile="$(readlink -f "$0")" export REPO_DIR="$(cd "$(dirname "${thisFile}")/.." && echo "$PWD")" -source "${REPO_DIR}/main.sh" || return 1 +source "${REPO_DIR}/main.sh" || exit 1 scr_name="$(bash_basename $0)" cmd="${scr_name//.sh/}" if [[ $DEBUG == 1 ]]; then set -x; fi