From ca725a1cb5a3ea235bce54ce61c05fdca770dc10 Mon Sep 17 00:00:00 2001
From: Jay Oster <jay@kodewerx.org>
Date: Sat, 27 Apr 2019 12:56:47 -0700
Subject: [PATCH 1/2] Additional macOS fixes

---
 edit-patches.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/edit-patches.sh b/edit-patches.sh
index 0ce0a99..90d4118 100755
--- a/edit-patches.sh
+++ b/edit-patches.sh
@@ -5,7 +5,7 @@
 
 prompt_changes() {
 	bold_arrow; echo "Editing $IO_COMMIT"
-	bold_arrow; echo -e "Remember to test your changes with: \e[1;36mcargo build\e[0m"
+	bold_arrow; echo -e "Remember to test your changes with: \033[1;36mcargo build\033[0m"
 
 	local MAIN_GIT_DIR="$GIT_DIR"
 	local GIT_DIR=./.git CORE_IO_COMMIT=$IO_COMMIT
@@ -18,9 +18,9 @@ prompt_changes() {
 	patch -s -p1 < $PATCH_DIR/$IO_COMMIT.patch
 	git commit -a -m "existing patch for $IO_COMMIT" > /dev/null
 
-	bold_arrow; echo -e "Applying patch from \e[1;36m$TMP_PATCH\e[0m"
+	bold_arrow; echo -e "Applying patch from \033[1;36m$TMP_PATCH\033[0m"
 	patch -p1 < $TMP_PATCH || true
-	bold_arrow; echo -e "Make your changes now (\e[1;36mctrl-D\e[0m when finished)"
+	bold_arrow; echo -e "Make your changes now (\033[1;36mctrl-D\033[0m when finished)"
 	bash_diff_loop "No changes were made"
 	bold_arrow; echo "Replacing $IO_COMMIT.patch with updated version"
 	git diff > $TMP_PATCH

From de8b72efde3b9363dde5690a6efe33554715bf21 Mon Sep 17 00:00:00 2001
From: Jay Oster <jay@kodewerx.org>
Date: Tue, 30 Apr 2019 18:55:16 -0700
Subject: [PATCH 2/2] Address review comments

---
 build-src.sh | 2 +-
 functions.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-src.sh b/build-src.sh
index dd7ea90..f360202 100755
--- a/build-src.sh
+++ b/build-src.sh
@@ -4,7 +4,7 @@
 # commit-db.rb list-valid nightly|GIT_DIR=/your/rust/dir/.git ./build-src.sh
 
 if [ $(uname) == 'Darwin' ]; then
-	alias tac='tail -f'
+	alias tac='tail -r'
 fi
 
 prompt_changes() {
diff --git a/functions.sh b/functions.sh
index 26fd5b2..85d3886 100644
--- a/functions.sh
+++ b/functions.sh
@@ -35,7 +35,7 @@ get_io_commits() {
 }
 
 get_patch_commits() {
-	find $PATCH_DIR -type f|xargs -n 1 basename|cut -d. -f1
+	find $PATCH_DIR -type f -print0|xargs -0 -n 1 basename|cut -d. -f1
 }
 
 prepare_version() {