X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;ds=sidebyside;f=brew%2Finstall.sh;h=6668e3e5e539328814e538cb095b08b3a38c6781;hb=2ff0fc638bfe4e71aac1d04c84430da8d0706ce7;hp=34b5a0da455fef905eedd5333f95b6e9d0345647;hpb=c77b2afba8be0e2aca21ad2647e7e847e4a8aa14;p=webi-installers%2F.git

diff --git a/brew/install.sh b/brew/install.sh
index 34b5a0d..6668e3e 100644
--- a/brew/install.sh
+++ b/brew/install.sh
@@ -1,4 +1,53 @@
 #!/bin/bash
 
-# Straight from https://brew.sh
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+set -e
+set -u
+
+function _install_brew() {
+    # Straight from https://brew.sh
+    #/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+
+    needs_xcode="$(/usr/bin/xcode-select -p >/dev/null 2> /dev/null || echo "true")"
+    if [[ -n "${needs_xcode}" ]]
+    then
+        echo ""
+        echo ""
+        echo "ERROR: Run this command to install XCode Command Line Tools first:"
+        echo ""
+        echo "    xcode-select --install"
+        echo ""
+        echo "After the install, close this terminal, open a new one, and try again."
+        echo ""
+        exit 1
+    fi
+
+    # From Straight from https://brew.sh
+    if ! [ -d "$HOME/.local/opt/brew" ]; then
+        echo "Installing to '$HOME/.local/opt/brew'"
+        echo ""
+        echo "If you prefer to have brew installed to '/usr/local' cancel now and do the following:"
+        echo "        rm -rf '$HOME/.local/opt/brew'"
+        echo '        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
+        echo ""
+        sleep 3
+        git clone --depth=1 https://github.com/Homebrew/brew "$HOME/.local/opt/brew"
+    fi
+
+    webi_path_add "$HOME/.local/opt/brew/bin"
+    export PATH="$HOME/.local/opt/brew/bin:$PATH"
+
+    echo "Updating brew..."
+    brew update
+
+    webi_path_add "$HOME/.local/opt/brew/sbin"
+    export PATH="$HOME/.local/opt/brew/sbin:$PATH"
+
+    echo "Installed 'brew' to '$HOME/.local/opt/brew'"
+    echo ""
+    echo "If you prefer to have brew installed to '/usr/local' do the following:"
+    echo "        mv '$HOME/.local/opt/brew' '$HOME/.local/opt/brew.$(date '+%F_%H-%M-%S').bak'"
+    echo '        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
+    echo ""
+}
+
+_install_brew