From 60d2adedd4ec929812458103c94839f8d6b2505b Mon Sep 17 00:00:00 2001
From: Daniel Barber <github@danbarber.me>
Date: Mon, 22 Apr 2019 22:07:11 -0400
Subject: [PATCH] Does bash work better?

---
 extra.sh        | 3 ++-
 lib/chunkwm.sh  | 4 ++--
 lib/dotfiles.sh | 3 ++-
 lib/mas.sh      | 2 +-
 lib/tools.sh    | 2 +-
 setup.sh        | 5 +++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/extra.sh b/extra.sh
index ccf80f6..5022d9c 100755
--- a/extra.sh
+++ b/extra.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
 MAC_SETUP_DIR="$HOME/mac-setup"
 
 BOLD="\033[1m"
diff --git a/lib/chunkwm.sh b/lib/chunkwm.sh
index 4a05668..a96f0d1 100755
--- a/lib/chunkwm.sh
+++ b/lib/chunkwm.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Ask the user to generate a code signing key for `chunkwm`
 echo "Please generate a code signing certificate called 'chunkwm-cert' in Keychain Access"
-sh -c 'read -r -p "Press any key to continue... " -n 1'
+read -r -p "Press any key to continue... " -n 1
 
 # We need to code sign chunkwm and skhd in order for them to be added to the
 # accessibility allowed list.
diff --git a/lib/dotfiles.sh b/lib/dotfiles.sh
index 2b45a3e..28ea756 100755
--- a/lib/dotfiles.sh
+++ b/lib/dotfiles.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
 cd "$HOME"
 
 if [ $SHELL != $(which zsh) ]; then
diff --git a/lib/mas.sh b/lib/mas.sh
index 1b76dca..b434436 100755
--- a/lib/mas.sh
+++ b/lib/mas.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # mas install 13764025890
 mas install 1107421413
diff --git a/lib/tools.sh b/lib/tools.sh
index 30592f5..2cd74c0 100755
--- a/lib/tools.sh
+++ b/lib/tools.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 export LDFLAGS="-L/usr/local/opt/zlib/lib"
 export CPPFLAGS="-I/usr/local/opt/zlib/include"
diff --git a/setup.sh b/setup.sh
index f393d76..c967579 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
 MAC_SETUP_DIR="$HOME/mac-setup"
 
 BOLD="\033[1m"
@@ -19,7 +20,7 @@ if [ ! -f "$HOME/.ssh/id_ed25519.pub" ]; then
   echo "============ Public key ============="
   cat ~/.ssh/id_ed25519.pub
   echo "====================================="
-  sh -c 'read -r -p "Press any key to continue... " -n 1'
+  read -r -p "Press any key to continue... " -n 1
 fi
 
 # Add the SSH key to the agent now to avoid multiple prompts