macOS additions/changes (#8)

* use realpath instead of readlink -f

* fix .profile to work with zsh on macos

* bring back zsh

This reverts commit e622253.

* add subl bin to PATH

* add support for macos git prompt

* fixes for sublime text on macos

* quote paths just in case

* add script to bootstrap macos

* also source git bash completion script

* fix order of redirection

Author: anlutro

configs/shell/bashrc

@@ -79,8 +79,19 @@ fi
 #   |__/       \______/ |______/
 
 # on some systems this is not sourced automatically
-if [ -e /usr/share/git/completion/git-prompt.sh ] && ! command -v __git_ps1 >/dev/null 2>&1; then
-    . /usr/share/git/completion/git-prompt.sh
+if ! command -v __git_ps1 >/dev/null 2>&1; then
+    if [ -e '/usr/share/git/completion/git-prompt.sh' ]; then
+        . '/usr/share/git/completion/git-prompt.sh'
+    elif [ -e '/usr/local/etc/bash_completion.d/git-prompt.sh' ]; then
+        . '/usr/local/etc/bash_completion.d/git-prompt.sh'
+    fi
+fi
+if ! command -v ___git_complete >/dev/null 2>&1; then
+    if [ -e '/usr/share/git/completion/git-completion.bash' ]; then
+        . '/usr/share/git/completion/git-completion.bash'
+    elif [ -e '/usr/local/etc/bash_completion.d/git-completion.bash' ]; then
+        . '/usr/local/etc/bash_completion.d/git-completion.bash'
+    fi
 fi
 
 # wrap in a function to allow local variables

configs/shell/profile

@@ -6,21 +6,23 @@ umask 022
 
 # add paths to $PATH. these should be listed in order of
 # least precedence first, highest precedence last
-paths="
+_paths=(
 /sbin
 /usr/sbin
-$HOME/Library/Python/*/bin
-$HOME/.cargo/bin
-$HOME/.npm/bin
-$HOME/.local/bin
-$HOME/bin
-"
-for path in $paths; do
-    if [ -d "$path" ] && [ ! -L "$path" ]; then
-        PATH="$path:$PATH"
+/usr/local/opt/*/libexec/gnubin
+"/Applications/Sublime Text.app/Contents/SharedSupport/bin"
+"$HOME/Library/Python/*/bin"
+"$HOME/.cargo/bin"
+"$HOME/.npm/bin"
+"$HOME/.local/bin"
+"$HOME/bin"
+)
+for _path in "${_paths[@]}"; do
+    if [ -d "$_path" ] && [ ! -L "$_path" ]; then
+        PATH="$_path:$PATH"
     fi
 done
-unset path paths
+unset _path _paths
 
 # bashrc doesn't execute itself
 if [ -n "$BASH_VERSION" ]; then

install.sh

@@ -13,7 +13,7 @@ if [ ! -d $HOME/.local/bin ]; then
     mkdir -p $HOME/.local/bin
 fi
 bindir=$HOME/.local/bin
-root=$(dirname "$(readlink -f "$0")")
+root=$(dirname "$(realpath "$0")")
 configs=$root/configs
 scripts=$root/scripts
 vendor=$root/vendor
@@ -172,7 +172,7 @@ install_i3blocks() {
     ln -sf $vendor/i3blocks-contrib/volume/volume $conf_path/scripts/
 
     for f in $configs/i3/block-scripts/*; do
-        filepath=$(readlink -f $f)
+        filepath=$(realpath $f)
         filename=$(basename $f)
         ln -sf $filepath $conf_path/scripts/$filename
     done
@@ -221,14 +221,21 @@ install_rg() {
 }
 
 install_subl() {
-    pkgdir=$HOME/.config/sublime-text-3/Packages
-    userdir=$pkgdir/User
-    mkdir -p $pkgdir
-    if [ -d $userdir ] && [ ! -L $userdir ]; then
-        mv $userdir $userdir.bak
+    if [ -d $HOME/.config/sublime-text-3/Packages ]; then
+        pkgdir=$HOME/.config/sublime-text-3/Packages
+    elif [ -d "$HOME/Library/Application Support/Sublime Text/Packages" ]; then
+        pkgdir="$HOME/Library/Application Support/Sublime Text/Packages"
+    else
+        echo "Sublime Text Packages directory not found!"
+        return
+    fi
+    userdir="$pkgdir/User"
+    mkdir -p "$pkgdir"
+    if [ -d "$userdir" ] && [ ! -L "$userdir" ]; then
+        mv "$userdir" "$userdir.bak"
     fi
-    ln -sfT $configs/sublime-text $userdir
-    ln -sf $scripts/sublp.sh $bindir/sublp
+    ln -sfT "$configs/sublime-text" "$userdir"
+    ln -sf "$scripts/sublp.sh" "$bindir/sublp"
 }
 
 install_taskwarrior() {
@@ -331,6 +338,13 @@ install_xorg() {
     rm -f $HOME/.config/fontconfig/local.conf
 }
 
+install_zsh() {
+    ln -sf $configs/shell/zshrc $HOME/.zshrc
+    ln -sf $configs/shell/profile $HOME/.zprofile
+    ln -sf $configs/shell/logout $HOME/.zlogout
+    _install_fzf
+}
+
 
 if [ ! -e $root/.venv ]; then
     echo "Setting up virtual environment ..."
@@ -395,6 +409,7 @@ install vim
 install nvim
 install xorg Xorg
 install xdg xdg-open
+install zsh
 
 [ -e ~/.dropbox-dist ] && install_dropbox
 

scripts/bootstrap-macos.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+confirm() {
+    echo -n "$* [Y/n] "
+    read REPLY
+    if [ -z "$REPLY" ] || [ "$REPLY" != "${REPLY#[Yy]}" ]; then
+        return 0
+    fi
+    return 1
+}
+
+# attempt to get rid of mouse + scroll wheel acceleration
+defaults write -g com.apple.mouse.scaling -int -1
+defaults write -g com.apple.scrollwheel.scaling -int -1
+
+# un-invert scrolling
+defaults write -g com.apple.swipescrolldirection -int 0
+
+# I don't like homebrew but there are no good alternatives
+if ! command -v brew >/dev/null 2>&1 && confirm "Install Homebrew?"; then
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+	# gnu utils to replace horribly out of date bsd grep/awk etc.
+	brew install coreutils findutils gawk grep gnu-tar gnu-sed gnu-getopt
+fi

scripts/i3-switch.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-dir="$(dirname "$(readlink -f "$0")")"
+dir="$(dirname "$(realpath "$0")")"
 id="$(i3-msg -t get_tree | $dir/i3-get.py "${1-next}")"
 [ $? = 0 ] && [ "$id" ] && i3-msg [id="$id"] focus >/dev/null

scripts/sublp.sh

@@ -6,7 +6,7 @@ if ! command -v subl >/dev/null 2>&1; then
     exit 1
 fi
 
-dir=$(readlink -f "${1-$PWD}")
+dir=$(realpath "${1-$PWD}")
 cd $dir || exit 1
 
 find_sublime_project_file() {
@@ -24,7 +24,7 @@ done
 if [ -z "$sp" ]; then
     echo "No sublime-project found, running init-project ..."
     init-project --noninteractive --allow-no-type
-    dir=$(readlink -f "${1-$PWD}")
+    dir=$(realpath "${1-$PWD}")
     sp="$(find_sublime_project_file "$dir")"
 fi
 if [ -z "$sp" ]; then

scripts/upgrade/_lib.sh

@@ -35,7 +35,7 @@ fail() {
 }
 
 latest_already_installed() {
-    script="$(basename "$(readlink -f "$0")")"
+    script="$(basename "$(realpath "$0")")"
     name="${script%%.*}"
     echo "Latest version of $name ($version) is already installed!" >&2
     exit 0
@@ -47,7 +47,7 @@ download() {
     cd ~/downloads || exit 1
     wget "$1" -O "$filename"
     if [ -z "${2-}" ]; then
-        readlink -f "$filename"
+        realpath "$filename"
     fi
 }
 

scripts/upgrade/acrophone.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 url=$(gh_urls bcicen/acrophone | grep linux-amd64 | head -1)
 version=$(echo $url | sed -r 's|.*/download/v([0-9.-]+)/.*|\1|')

scripts/upgrade/docker-compose.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 url=$(gh_urls docker/compose | grep Linux-x86_64 | grep -v -- '-rc' | head -1)
 version=$(echo $url | sed -r 's|.*/download/([0-9.-]+)/.*|\1|')

scripts/upgrade/docker-machine.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 url=$(gh_urls docker/machine | grep -v -- '-rc' | head -1)
 version=$(echo $url | sed -r 's|.*/download/v([0-9.-]+)/.*|\1|')

scripts/upgrade/earthly.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(gh_releases earthly/earthly | head -1)
 

scripts/upgrade/fluxctl.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 repo=fluxcd/flux
 version=$(gh_tags $repo | head -1)

scripts/upgrade/go.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 if [ $# -gt 0 ]; then
     version="$1"

scripts/upgrade/helm.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 # exclude alpha/beta/rc, and always get highest version number (as opposed to
 # most recent release by date)

scripts/upgrade/k3s.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(gh_tags rancher/k3s | head -1)
 

scripts/upgrade/keepassxc.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 # grep for digits removes alpha/beta/rc releases
 url=$(gh_urls keepassxreboot/keepassxc | grep -P '\/[\d\.]+\/' | grep '\.AppImage$' | head -1)

scripts/upgrade/kops.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(gh_tags kubernetes/kops | head -1)
 

scripts/upgrade/kotlin.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 url=$(gh_url JetBrains/kotlin | grep -F linux-x64 | head -1)
 version=$(basename $url | grep -oP '\d+(\.\d+)+')

scripts/upgrade/kubectl.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 

scripts/upgrade/kubeseal.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(gh_latest_tag bitnami-labs/sealed-secrets/releases/latest)
 

scripts/upgrade/minikube.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(gh_latest_tag kubernetes/minikube)
 

scripts/upgrade/php.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 if [ $# -lt 1 ];then
 	fail "Must provide version!"

scripts/upgrade/python.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 versions=$(gh_tags python/cpython | sed -r 's/^v//g' | grep -xP "\d+\.\d+\.\d+" | sort -V)
 if [ $# -gt 0 ]; then

scripts/upgrade/shellcheck.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(gh_latest_tag koalaman/shellcheck)
 version_num=$(echo "$version" | sed s/^v//)

scripts/upgrade/terraform.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version=$(
 	curl -sSL https://releases.hashicorp.com/terraform/ \

scripts/upgrade/terragrunt.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 version="${1-$(gh_latest_tag gruntwork-io/terragrunt)}"
 

scripts/upgrade/vagrant.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 # shellcheck source=_lib.sh
-. "$(dirname "$(readlink -f "$0")")/_lib.sh"
+. "$(dirname "$(realpath "$0")")/_lib.sh"
 
 url=$(curl -sSL https://www.vagrantup.com/downloads.html | grep -oP 'https://[/A-z0-9._-]+_x86_64\.deb' | sort -V | tail -1)
 version=$(echo $url | sed -r 's/.*vagrant_([0-9.]+)_x86_64.*/\1/')

update-vendors.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-root=$(dirname "$(readlink -f "$0")")
+root=$(dirname "$(realpath "$0")")
 
 update_fzf() {
     ./install --bin