chore(scripts): eval scripts/shared.sh

2026-01-26 03:04:06 +00:00 · 2024-07-17 10:04:16 +03:00
parent 8a3b2e703c
commit adecceda7a
21 changed files with 21 additions and 39 deletions
--- a/base/zshenv
+++ b/base/zshenv
@@ -16,4 +16,4 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"

-source "$DOTFILES/config/shared"
+eval "$DOTFILES/config/shared.sh"
--- a/scripts/create-nvim-keymaps.sh
+++ b/scripts/create-nvim-keymaps.sh
@@ -2,10 +2,7 @@
 # Create file containing key mappings for Neovim
 # Usage: ./create-nvim-keymaps.sh

-source "$HOME/.dotfiles/scripts/shared.sh"
-source "$HOME/.dotfiles/config/exports"
-source "$HOME/.dotfiles/config/alias"
-source "$HOME/.dotfiles/config/functions"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 DEST="$HOME/.dotfiles/docs/nvim-keybindings.md"

--- a/scripts/create-omp-screenshot.sh
+++ b/scripts/create-omp-screenshot.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"
 set -e

 cd "$DOTFILES" || exit
--- a/scripts/install-asdf.sh
+++ b/scripts/install-asdf.sh
@@ -2,7 +2,7 @@
 #
 # Install asdf

-source "${XDG_CONFIG_HOME}/shared"
+source "${XDG_CONFIG_HOME}/shared.sh"
 source "${DOTFILES}/scripts/shared.sh"

 export ASDF_DIR="${XDG_BIN_HOME}/asdf"
--- a/scripts/install-cargo-packages.sh
+++ b/scripts/install-cargo-packages.sh
@@ -2,27 +2,12 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/config/exports"
-source "$HOME/.dotfiles/config/alias"
-source "$HOME/.dotfiles/config/functions"
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg "Starting to install rust/cargo packages"

-! x-have cargo && {
-  msg "cargo could not be found. installing cargo with rustup.rs"
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
-}
-
 source "$CARGO_HOME/env"

-! x-have rustup && {
-  msg_err "rustup could not be found. Aborting..."
-  exit 1
-}
-
-rustup default stable
-
 # If we have cargo install-update, use it first
 x-have cargo-install-update && {
  msg_run "Updating cargo packages with cargo install-update"
--- a/scripts/install-cheat-purebashbible.sh
+++ b/scripts/install-cheat-purebashbible.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2231,SC2034,SC2181,SC2068
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 PBB_REQUIRED_TOOLS=(git cheat)
 for t in ${PBB_REQUIRED_TOOLS[@]}; do
--- a/scripts/install-composer.sh
+++ b/scripts/install-composer.sh
@@ -2,7 +2,7 @@
 # Install PHP Package Manager Composer
 #
 # shellcheck source="shared.sh"
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 ! x-have "php" && msg_err "PHP Not Available, cannot install composer" && exit 0

--- a/scripts/install-fonts.sh
+++ b/scripts/install-fonts.sh
@@ -2,7 +2,7 @@
 # Install NerdFonts
 #
 # shellcheck source="shared.sh"
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 GIT_REPO="https://github.com/ryanoasis/nerd-fonts.git"
 TMP_PATH="$XDG_CACHE_HOME/nerd-fonts"
--- a/scripts/install-fzf.sh
+++ b/scripts/install-fzf.sh
@@ -3,7 +3,7 @@
 # Install fzf
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 FZF_GIT="https://github.com/junegunn/fzf.git"
 FZF_PATH="${XDG_CONFIG_HOME}/fzf"
--- a/scripts/install-gh-extensions.sh
+++ b/scripts/install-gh-extensions.sh
@@ -2,7 +2,7 @@
 # Install GitHub CLI extensions
 #
 # shellcheck source="shared.sh"
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg_run "Installing gh (GitHub Client) extensions"

--- a/scripts/install-git-crypt.sh
+++ b/scripts/install-git-crypt.sh
@@ -4,7 +4,7 @@
 # NOTE: Experimental, wip
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg_run "Installing git-crypt"

--- a/scripts/install-go-packages.sh
+++ b/scripts/install-go-packages.sh
@@ -2,7 +2,7 @@
 # Install Go packages
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg_run "Installing go packages"

--- a/scripts/install-neofetch.sh
+++ b/scripts/install-neofetch.sh
@@ -3,7 +3,7 @@
 # Install neofetch from source
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 NEOFETCH_VERSION="7.1.0"
 NEOFETCH_REPO="https://github.com/dylanaraps/neofetch"
--- a/scripts/install-npm-packages.sh
+++ b/scripts/install-npm-packages.sh
@@ -2,7 +2,7 @@
 # Install npm packages globally.
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg "Starting to install npm packages"

--- a/scripts/install-ntfy.sh
+++ b/scripts/install-ntfy.sh
@@ -3,7 +3,7 @@
 # Install ntfy
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"
 set -e

 x-have "ntfy" && msg "ntfy already installed" && exit 0
--- a/scripts/install-ohmybash.sh
+++ b/scripts/install-ohmybash.sh
@@ -3,7 +3,7 @@
 # Install oh-my-bash
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 export OSH="$HOME/.local/share/oh-my-bash"

--- a/scripts/install-ohmyposh.sh
+++ b/scripts/install-ohmyposh.sh
@@ -3,7 +3,7 @@
 # Install oh-my-posh
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 curl -s https://ohmyposh.dev/install.sh | bash -s -- -d ~/.local/bin

--- a/scripts/install-pip-packages.sh
+++ b/scripts/install-pip-packages.sh
@@ -2,7 +2,7 @@
 # Install python/pip packages.
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg "Starting to install pip packages"

--- a/scripts/install-z.sh
+++ b/scripts/install-z.sh
@@ -3,7 +3,7 @@
 # Install z
 #
 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 Z_GIT_PATH="https://github.com/rupa/z.git"
 Z_BIN_PATH="$XDG_BIN_HOME/z"
--- a/scripts/set-macos-defaults.sh
+++ b/scripts/set-macos-defaults.sh
@@ -9,7 +9,7 @@
 [ "$(uname)" != "Darwin" ] && echo "Not a macOS system" && exit 0

 # shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
+eval "$HOME/.dotfiles/scripts/shared.sh"

 msg_run "Starting to set macOS defaults, these require sudo privileges:"

--- a/scripts/shared.sh
+++ b/scripts/shared.sh
@@ -12,7 +12,7 @@
    || [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null)
 ) && sourced=1 || sourced=0

-source "$HOME/.dotfiles/config/shared.sh"
+eval "$HOME/.dotfiles/config/shared.sh"

 DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=)
 export DOTFILES_CURRENT_SHELL