From c9a069fe5a6323b9c4dc7626026fd4d83306694a Mon Sep 17 00:00:00 2001
From: Wryn Wagner <wagner.wryn@gmail.com>
Date: Tue, 10 Nov 2020 16:14:06 -0700
Subject: [PATCH] Various error fixes

---
 zsh/config | 2 ++
 zsh/google | 6 ++++++
 zsh/rc     | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/zsh/config b/zsh/config
index f6da0eb..9f7c45b 100644
--- a/zsh/config
+++ b/zsh/config
@@ -1,3 +1,5 @@
+#!/bin/zsh
+
 # --- General ZSH Settings -----------------------------------
 HISTFILE=~/.histfile
 HISTSIZE=1000
diff --git a/zsh/google b/zsh/google
index 69e1b85..2e10d50 100644
--- a/zsh/google
+++ b/zsh/google
@@ -4,10 +4,16 @@ alias gdrive="RCLONE_GOOGLE_DRIVE_MOUNT"
 
 RCLONE_GOOGLE_DRIVE_MOUNT() {
 	local RCLONE_REMOTE_NAME='google-drive';
+	local MOUNT_POINT="$HOME/GoogleDrive";
+
+	[ -d $MOUNT_POINT ] \
+		&& { echo "connection already active at '$MOUNT_POINT'"; return 1; }
 
 	clear;
 	figlet GOOGLE DRIVE CONNECTION | lolcat;
 	echo -e "\e[3m(C-c to close)\e[0m";
 
+	mkdir $MOUNT_POINT
 	rclone mount "$RCLONE_REMOTE_NAME:$1" "$HOME/GoogleDrive"
+	rmdir $MOUNT_POINT
 }
diff --git a/zsh/rc b/zsh/rc
index 8c5404d..93391cb 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -21,14 +21,14 @@ esac
 
 # --- set default editor -------------------------------------------
 SET_PREFERRED_EDITOR() {
-	local PREFERENCE="$PREFERRED_EDITOR"; # load preference from environment (vi vim) by default
-	[ -z $PREFERENCE ] && { echo 'unable to find $PREFERRED_EDITOR environment variable'; return 1; }
+	# load preference from environment (vi vim) by default
+	[[ -z $PREFERRED_EDITOR ]] && { echo 'unable to find $PREFERRED_EDITOR environment variable'; return 1; }
 
-	[[ $EDITOR == "${PREFERENCE[-1]}" ]] && [[ $VISUAL == "${PREFERENCE[-1]}" ]] && return 0;
+	[[ $EDITOR == "${PREFERRED_EDITOR[-1]}" ]] && [[ $VISUAL == "${PREFERENCE[-1]}" ]] && return 0;
 
 	local AVAILABLE_EDITOR="$EDITOR";
 
-	for program in $PREFERENCE; do which $program >/dev/null 2>&1 && AVAILABLE_EDITOR="$program"; done
+	for program in $PREFERRED_EDITOR; do which $program >/dev/null 2>&1 && AVAILABLE_EDITOR="$program"; done
 
 	export EDITOR="$AVAILABLE_EDITOR";
 	export VISUAL="$AVAILABLE_EDITOR";