From 9348503574e8720a6e274b8876187b7e29194ba8 Mon Sep 17 00:00:00 2001
From: Rob Muhlestein <rob@rwx.gg>
Date: Wed, 9 Feb 2022 03:23:51 -0500
Subject: [PATCH] Combine mac install into single file

---
 .bashrc                  |  3 ++-
 install/mac/install-bash |  6 ------
 install/mac/install-gnu  | 10 ++++++++++
 install/mac/install-gpg  |  2 ++
 install/mac/install-jq   |  2 --
 install/mac/install-lynx |  2 --
 scripts/gpgcreate        |  0
 scripts/i                |  2 --
 scripts/tmuxin           |  2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100755 install/mac/install-bash
 create mode 100755 install/mac/install-gnu
 create mode 100755 install/mac/install-gpg
 delete mode 100755 install/mac/install-jq
 delete mode 100755 install/mac/install-lynx
 create mode 100755 scripts/gpgcreate
 delete mode 100755 scripts/i

diff --git a/.bashrc b/.bashrc
index db54f3f..93d7a81 100644
--- a/.bashrc
+++ b/.bashrc
@@ -116,7 +116,8 @@ pathprepend() {
 
 # remember last arg will be first in path
 pathprepend \
-  /usr/local/go/bin \
+  /usr/local/bin \
+  /usr/local/*/bin \
   "$HOME/.local/bin" \
   "$GHREPOS/cmd-"* \
   "$SCRIPTS" 
diff --git a/install/mac/install-bash b/install/mac/install-bash
deleted file mode 100755
index 17d11bd..0000000
--- a/install/mac/install-bash
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-brew install bash
-echo "Now don't forget:"
-echo "  Add /usr/local/bin/bash to /etc/shells"
-echo "  Run chsh -s /usr/local/bin/bash"
-echo "  Use #!/usr/bin/env bash as shebang line"
diff --git a/install/mac/install-gnu b/install/mac/install-gnu
new file mode 100755
index 0000000..1c2f22c
--- /dev/null
+++ b/install/mac/install-gnu
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+exec brew install coreutils binutils diffutils ed findutils gawk gnu-indent gnu-sed 
+  gnu-tar gnu-which gnutls grep gzip screen tmux watch wdiff curl wget bash gdb gpatch 
+  m4 make file-formula git less openssh python rsync unzip vim gpg jq bash lynx
+
+echo "Now don't forget:"
+echo "  Add /usr/local/bin/bash to /etc/shells"
+echo "  Run chsh -s /usr/local/bin/bash"
+echo "  Use #!/usr/bin/env bash as shebang line"
diff --git a/install/mac/install-gpg b/install/mac/install-gpg
new file mode 100755
index 0000000..70efd06
--- /dev/null
+++ b/install/mac/install-gpg
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec brew install gpg
diff --git a/install/mac/install-jq b/install/mac/install-jq
deleted file mode 100755
index c056982..0000000
--- a/install/mac/install-jq
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec brew install jq
diff --git a/install/mac/install-lynx b/install/mac/install-lynx
deleted file mode 100755
index 1f7d6c6..0000000
--- a/install/mac/install-lynx
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec brew install lynx
diff --git a/scripts/gpgcreate b/scripts/gpgcreate
new file mode 100755
index 0000000..e69de29
diff --git a/scripts/i b/scripts/i
deleted file mode 100755
index 32fa343..0000000
--- a/scripts/i
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-exec iam "$@"
diff --git a/scripts/tmuxin b/scripts/tmuxin
index 1cd83f3..54e9ca4 100755
--- a/scripts/tmuxin
+++ b/scripts/tmuxin
@@ -1,3 +1,3 @@
 #!/bin/sh
 unset TMUX
-exec /usr/bin/tmux -f ~/.tmux.conf -u "$@"
+exec /usr/bin/env tmux -f ~/.tmux.conf -u "$@"