From 52ed3913c8a3b8cea8b4756fa7da172f51915f1a Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 30 Jul 2018 20:20:56 -0700
Subject: [PATCH 1/2] Symlinks in tools.

---
 bin/install_tool | 18 +++++++++++++++---
 dotfiles/zshrc   |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bin/install_tool b/bin/install_tool
index a7ea69a..d5969aa 100755
--- a/bin/install_tool
+++ b/bin/install_tool
@@ -65,6 +65,15 @@ function check_sudo {
   sudo -l >/dev/null
 }
 
+function add_bin_symlink {
+  local TARGET NAME BINDIR
+  TARGET=${1}
+  NAME=${2:-$(basename ${1})}
+  BINDIR=${HOME}/bin/tools/
+  mkdir -p -- ${BINDIR}
+  ln -sf ${DESTDIR}/${TARGET} ${BINDIR}/${NAME}
+}
+
 DESTDIR="${HOME}/tools/${TOOL}"
 
 if [ -d ${DESTDIR} ] ; then
@@ -113,10 +122,11 @@ case ${TOOL} in
     gtemp=`mktemp -d`
     gbase="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/"
     # TODO: find a way to make this version independent
-    gsdk="google-cloud-sdk-142.0.0-linux-x86_64.tar.gz"
+    gsdk="google-cloud-sdk-209.0.0-linux-x86_64.tar.gz"
     download "${gbase}${gsdk}" /tmp/gcloud.tar.gz
     tar zxf /tmp/gcloud.tar.gz --strip-components=1 -C ${DESTDIR}
     rm /tmp/gcloud.tar.gz
+    add_bin_symlink bin/gcloud
     ;;
   android-sdk)
     # TODO: find a way to make this version independent
@@ -144,11 +154,13 @@ case ${TOOL} in
     fi
     ;;
   mitmproxy)
-    src=$(python -c 'import urllib2; import json; print(filter(lambda x: x["name"].endswith("-linux.tar.gz"), json.load(urllib2.urlopen("https://api.github.com/repos/mitmproxy/mitmproxy/releases/latest"))["assets"])[0]["browser_download_url"])')
-    download ${src} /tmp/mitmproxy.tar.gz
+    ver=$(python -c 'import urllib2; import json; print(json.load(urllib2.urlopen("https://api.github.com/repos/mitmproxy/mitmproxy/releases/latest"))["name"].replace("v",""))')
+    download https://snapshots.mitmproxy.org/${ver}/mitmproxy-${ver}-linux.tar.gz /tmp/mitmproxy.tar.gz
     mkdir -p ${DESTDIR}
     tar zx -C ${DESTDIR} -f /tmp/mitmproxy.tar.gz
     rm /tmp/mitmproxy.tar.gz
+    add_bin_symlink mitmproxy
+    add_bin_symlink mitmweb
     ;;
   esp)
     src="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-61-gab8375a-5.2.0.tar.gz"
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 20432f7..37b71bc 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -71,6 +71,9 @@ if [ -x /usr/bin/ack-grep ] ; then
   alias ack='/usr/bin/ack-grep'
 fi
 
+# Setup PATH for tools
+PATH=${PATH}:${HOME}/bin/tools
+
 # Most is nice, if we have it
 if command -v most >/dev/null 2>&1; then
   export PAGER="most"

From 7b0713675c29f402d9e61af693e340bc2773c34b Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 1 Aug 2018 20:32:53 -0700
Subject: [PATCH 2/2] Add psmisc to packages.cli.

---
 packages.cli | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages.cli b/packages.cli
index ab75a1e..e988d9d 100644
--- a/packages.cli
+++ b/packages.cli
@@ -16,6 +16,7 @@ nasm
 opensc
 openvpn
 p7zip-full
+psmisc
 python3
 python3-pip
 python3-virtualenv