From a314b1a27e45bd3d5e47bb67e67491213b94253e Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 15 Jun 2020 12:11:25 +0100
Subject: [PATCH] Remove references to catfish, and update aliases

So long, old friend
---
 files/bin/ctp                       | 23 -----------------------
 files/zshrc/.zshrc                  |  2 +-
 files/zshrc/{catfish.sh => crab.sh} |  8 +-------
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100755 files/bin/ctp
 rename files/zshrc/{catfish.sh => crab.sh} (50%)

diff --git a/files/bin/ctp b/files/bin/ctp
deleted file mode 100755
index 3b60518..0000000
--- a/files/bin/ctp
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ "$1" == "shell" ]; then
-    ctpr manage.py shell
-elif [ "$1" == "build" ]; then
-    ctpr build
-elif [ "$1" == "test" ] || [ "$1" == "t" ]; then
-    ctpr runtests ${@:2}
-elif [ "$1" == "run" ]; then
-    ctpr ${@:2}
-elif [ "$1" == "manage" ] || [ "$1" == "manage.py" ]; then
-    ctpr manage.py ${@:2}
-elif [ "$1" == "migrate" ]; then
-    ctpr manage.py migrate ${@:2}
-elif [ "$1" == "makemigrations" ]; then
-    ctpr manage.py makemigrations ${@:2}
-elif [ "$1" == "route" ]; then
-    ctf router ${PWD##*/}.ctf.sh --ident ${PWD##*/}:development:web
-else
-    ctf project $@
-fi
diff --git a/files/zshrc/.zshrc b/files/zshrc/.zshrc
index 79a4e3d..bf9e645 100644
--- a/files/zshrc/.zshrc
+++ b/files/zshrc/.zshrc
@@ -30,5 +30,5 @@ alias src="source {{ home }}/.zshrc && tmux source {{ home }}/.tmux.conf"
 {% include "base.sh" %}
 {% include "environment.sh" %}
 {% include "applications.sh" %}
-{% include "catfish.sh" %}
+{% include "crab.sh" %}
 {% include "javascript.sh" %}
diff --git a/files/zshrc/catfish.sh b/files/zshrc/crab.sh
similarity index 50%
rename from files/zshrc/catfish.sh
rename to files/zshrc/crab.sh
index 0849677..29c9755 100644
--- a/files/zshrc/catfish.sh
+++ b/files/zshrc/crab.sh
@@ -1,11 +1,5 @@
-alias ctpr="ctf project run --"
+alias ctpt="NO_MIGRATIONS=true IN_TEST=true FILE_STORAGE='django.core.files.storage.FileSystemStorage' crab manage.py test $@ --keepdb"
 
-alias ctfs="cd ~/catfish && ./start && cd - > /dev/null"
-alias ctpt="NO_MIGRATIONS=true IN_TEST=true FILE_STORAGE='django.core.files.storage.FileSystemStorage' ctpr manage.py test $@ --keepdb"
-
-export CATFISH_HOSTNAME_OVERRIDE=localhost
-
-# Crab
 export ENV_FILE=etc/environments/development/env,.env
 export PROC_FILE=etc/environments/development/procfile
 export BIN_DIRS=env/bin