From 71bf9f10e1e565fcf5a20d89ddda2181db8b97c2 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Thu, 16 Jul 2015 22:21:54 +0200
Subject: zsh: update 5 aliases/functions

---
 zsh/aliases.zsh    | 54 +++++++++++++++++++++++++++++++++++++-----------------
 zsh/completion/_5c |  2 +-
 zsh/completion/_5v |  2 +-
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 0546ce4..2f8a205 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -75,33 +75,51 @@ if have systemctl && [[ -d /run/systemd/system ]]; then
 fi
 
 function 5v {
-	if [[ -d "$HOME"/5/venvs/"$1" ]]; then
-		source "$HOME"/5/venvs/"$1"/bin/activate
+	if [[ -d "$HOME"/venvs/"$1" ]]; then
+		source "$HOME"/venvs/"$1"/bin/activate
 		printf "\x1b[38;5;2m==> 5venv ‘%s’ activated successfully.\x1b[0m\n" "$1"
+
 	else
 		printf "==> 5venv ‘%s’ not found\n" "$1"
 		printf "==> Create? [yN]: "
 		read yn
+
 		if [[ "$yn" == 'y' || "$yn" == 'yes' ]]; then
-			virtualenv-2.7 "$HOME"/5/venvs/"$1"
-			if (( $? == 0 )); then
-				print "\x1b[38;5;2m==> 5venv created successfully, installing basic requirements.\x1b[0m"
+			printf "==> Python version? [23]: "
+			read venvver
+
+			if [[ "$venvver" == '2' ]]; then
+				virtualenv2 "$HOME"/venvs/"$1"
+				if (( $? == 0 )); then
+					print "\x1b[38;5;2m==> 5venv created successfully, installing basic requirements.\x1b[0m"
+				else
+					print "\x1b[38;5;1m==> Error: 5env creation failed. Exiting.\x1b[0m"
+					return 1
+				fi
+				source "$HOME"/venvs/"$1"/bin/activate
+				pip install -r "$HOME"/venvs/5_requirements.txt
+
+			elif [[ "$venvver" == '3' ]]; then
+				virtualenv3 "$HOME"/venvs/"$1"
+				if (( $? == 0 )); then
+					print "\x1b[38;5;2m==> 5venv created successfully, activating environment.\x1b[0m"
+					print "==> Note that no requirements were installed due to version 3 was selected."
+				else
+					print "\x1b[38;5;1m==> Error: 5env creation failed. Exiting.\x1b[0m"
+					return 1
+				fi
+				source "$HOME"/venvs/"$1"/bin/activate
+
 			else
-				print "\x1b[38;5;1m==> Error: 5env creation failed. Exiting.\x1b[0m"
-				return 1
+				printf "==> virtualenv for version ‘%s’ not found.\n" "$venvver"
+				exit 1
 			fi
-			source "$HOME"/5/venvs/"$1"/bin/activate
-			pip install -r "$HOME"/5/venvs/5_requirements.txt
 		fi
 	fi
 }
 
 function 5c {
-	if [[ -n "$1" ]]; then
-		cd "$HOME"/5/code/"$1"
-	else
-		cd "$HOME"/5/code
-	fi
+	cd "$HOME"/projects/"$1"
 }
 
 function 5clone {
@@ -109,11 +127,13 @@ function 5clone {
 		print "No repo name"
 	fi
 
-	(cd "$HOME"/5/code
+	(cd "$HOME"/projects
 	git clone git@github.com:5m/"$1"
-	cd "$1"
+	shift
+	cd -)
+
+	pushd "$HOME"/projects/"$1"
 	git config --local user.email johannes@5monkeys.se
-	)
 }
 
 alias 5ssh='TERM=xterm ssh'
diff --git a/zsh/completion/_5c b/zsh/completion/_5c
index ca7eeac..5f309c7 100644
--- a/zsh/completion/_5c
+++ b/zsh/completion/_5c
@@ -1,4 +1,4 @@
 #compdef 5c
 
 _arguments \
-	"1: :($(print $HOME/5/code/*(/) | xargs -n1 basename))"
+	"1: :($(print $HOME/projects/*(/) | xargs -n1 basename))"
diff --git a/zsh/completion/_5v b/zsh/completion/_5v
index 3958269..659bb1a 100644
--- a/zsh/completion/_5v
+++ b/zsh/completion/_5v
@@ -1,4 +1,4 @@
 #compdef 5v
 
 _arguments \
-	"1: :($(print $HOME/5/venvs/*(/) | xargs -n1 basename))"
+	"1: :($(print $HOME/venvs/*(/) | xargs -n1 basename))"
-- 
cgit v1.2.3-54-g00ecf