From fcb8d49cf96fd1ffae8cdbb6cabf7f4146354b6a Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:18:48 -0800
Subject: [PATCH 1/6] remove brew install from env.toml

---
 scripts/makefile/env.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/makefile/env.toml b/scripts/makefile/env.toml
index 8cdd7bb430..b9e33a6b89 100644
--- a/scripts/makefile/env.toml
+++ b/scripts/makefile/env.toml
@@ -3,7 +3,6 @@ run_task = { name = ["install_targets","install_diesel", "install_protobuf"] }
 
 [tasks.install_diesel]
 script = """
-brew install sqlite3
 cargo install diesel_cli --no-default-features --features sqlite
 """
 
@@ -17,8 +16,6 @@ rustup target add aarch64-apple-darwin
 
 [tasks.install_protobuf]
 script = """
-brew install protobuf@3.13
-
 # Custom dart:
 #brew tap dart-lang/dart
 #brew install dart

From df053fbc48e1f3518ef1a5468f1ab93425d53616 Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:19:49 -0800
Subject: [PATCH 2/6] use brew bundle

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 378df2ad25..acea6010ad 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,12 @@
 flowy_dev: install_cargo_make
 	cargo make flowy_dev
 
-install_cargo_make: 
+install_cargo_make:
 	cargo install --force cargo-make
+	brew bundle
 
 install_rust:
 	sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 	curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
 	echo 'export PATH="$$HOME/.cargo/bin:$$PATH"' >> ~/.bash_profile
-	source ~/.bash_profile
\ No newline at end of file
+	source ~/.bash_profile

From ce8979afe8f4724cc05dcdc6b3c7f275c0f9e8bb Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:20:21 -0800
Subject: [PATCH 3/6] Create Brewfile

---
 Brewfile | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Brewfile

diff --git a/Brewfile b/Brewfile
new file mode 100644
index 0000000000..1df7e50de7
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,2 @@
+brew 'protobuf@3.13'
+brew 'sqlite3'

From 1cdf5aea53392c686300214a49bba6adb1f90139 Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:23:54 -0800
Subject: [PATCH 4/6] add rustup-init

---
 Brewfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Brewfile b/Brewfile
index 1df7e50de7..61e252d774 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,2 +1,3 @@
 brew 'protobuf@3.13'
 brew 'sqlite3'
+brew 'rustup-init'

From e334cde639abb6f2f83aeb25fa5c50bfe4d4c8eb Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:25:45 -0800
Subject: [PATCH 5/6] try using rustup-init for rust install

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index acea6010ad..84ea9d3bb6 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,5 @@ install_cargo_make:
 	brew bundle
 
 install_rust:
-	sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
-	curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
-	echo 'export PATH="$$HOME/.cargo/bin:$$PATH"' >> ~/.bash_profile
-	source ~/.bash_profile
+	brew bundle
+	rustup-init -y

From 3cfa7d0c6820531bc6a8cfe72f02db9ab9bd024f Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Tue, 16 Nov 2021 00:34:20 -0800
Subject: [PATCH 6/6] unpin protobuf version

3.13 no longer available
---
 Brewfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index 61e252d774..4120e423f4 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,3 +1,3 @@
-brew 'protobuf@3.13'
+brew 'protobuf'
 brew 'sqlite3'
 brew 'rustup-init'