From 02ec86e6475c1aa817afb07c4272afd28f341c39 Mon Sep 17 00:00:00 2001 From: blyndusk Date: Mon, 7 Mar 2022 14:43:01 +0100 Subject: [PATCH] fix(auto): #24 - fix packages --- exec/packages/brew.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/exec/packages/brew.sh b/exec/packages/brew.sh index 63fc6d7..f674a19 100755 --- a/exec/packages/brew.sh +++ b/exec/packages/brew.sh @@ -8,25 +8,20 @@ exec_b=(brew update) exec_c=(brew upgrade) exec_d=(brew cleanup) exec_e=(brew doctor) -exec_f="eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" ui_start if [ "$(which brew)" != 0 ]; then - git clone https://github.com/Homebrew/brew.git "$HOME"/.brew/brew - git clone https://github.com/Homebrew/homebrew-core.git "$HOME"/.brew/homebrew-core - export HOMEBREW_BREW_GIT_REMOTE="$HOME/.brew/brew" # put your Git mirror of Homebrew/brew here - export HOMEBREW_CORE_GIT_REMOTE="$HOME/.brew/homebrew-core" ui_info "installing brew executable" ui_cmd "NONINTERACTIVE=1 /bin/bash -c $(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" if [ -f "$HOME"/.zshrc ]; then ui_info "$HOME/.zshrc detected" - if ! grep -q "$exec_f" < "$HOME"/.zshrc ; then + if ! grep -q "$eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" < "$HOME"/.zshrc ; then ui_info "dotfile sourcing not found" - ui_cmd "$exec_f >> $HOME/.zshrc" - printf "\n%s\n" "$exec_f" >> "$HOME"/.zshrc + ui_cmd "$eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) >> $HOME/.zshrc" + printf "\n%s\n" "$eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" >> "$HOME"/.zshrc else ui_info "sourcing already found, terminating" fi @@ -46,10 +41,11 @@ do ui_cmd "${exec[@]}" ; "${exec[@]}" done +ui_cmd "eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) ui_cmd "${exec_b[@]}" ; "${exec_b[@]}" ui_cmd "${exec_c[@]}" ; "${exec_c[@]}" ui_cmd "${exec_d[@]}" ; "${exec_d[@]}" ui_cmd "${exec_e[@]}" ; "${exec_e[@]}" -ui_cmd "eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" ; "eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" ui_done