From eefbd029b55b2782b0d7b11b4989ce0ca9b256cd Mon Sep 17 00:00:00 2001
From: Mitch Riedstra <mitch@riedstra.us>
Date: Tue, 15 Oct 2019 20:56:41 -0400
Subject: Massive organization of my dotfiles

---
 shell/build.sh | 17 -----------------
 shell/conf     | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 28 deletions(-)

(limited to 'shell')

diff --git a/shell/build.sh b/shell/build.sh
index 85b648c..3a6c129 100755
--- a/shell/build.sh
+++ b/shell/build.sh
@@ -2,7 +2,6 @@
 
 cat \
 	notice \
-	ksh \
 	aliases \
 	utils \
 	colors \
@@ -10,19 +9,3 @@ cat \
 	update \
 	conf \
 	> ../mkshrc
-
-cat \
-	notice \
-	aliases \
-	utils \
-	colors \
-	bash \
-	> ../bashrc
-
-cat \
-	notice \
-	aliases \
-	utils \
-	colors \
-	ash \
-	> ../ashrc
diff --git a/shell/conf b/shell/conf
index 8ea9d27..efd8710 100644
--- a/shell/conf
+++ b/shell/conf
@@ -1,11 +1,15 @@
 
 SHELL_CONFIG=".mkshrc"
 COLOR=0
+case "$TERM" in
+	xterm*) COLOR=1;;
+	*256color) COLOR=1;;
+esac
 
 export EDITORS="ed vi vim "
 export PATH="$HOME/bin:$PATH"
 
-UPDATE_URL="https://www.rygel.us/etc/"
+UPDATE_URL="https://git.riedstra.us/mitch/dotfiles.git/plain/"
 VIM_GIT_URL="https://git.riedstra.us/mitch/vim-cfg.git"
 VIM_BASIC_URL="https://git.riedstra.us/mitch/vim-cfg.git/plain/basic.vim"
 
@@ -23,33 +27,30 @@ fi
 set_pager
 set_editor
 # requires misc
-set_go
+# set_go
 
 setaliases
 setsudoaliases
+
+# checkSSHAgent
 	
 
 # Nasty conditional for support of many different shells
 if
+	! [ -z "$KSH_VERSION" ] ||
 	[ $SHELL = "/bin/ksh" ] ||
 	[ $SHELL = "/bin/mksh" ] ||
 	[ $SHELL = "/usr/bin/mksh" ] ||
-	[ $SHELL = "/usr/local/bin/mksh" ] ||
-	! [ -z "$KSH_VERSION" ]
+	[ $SHELL = "/usr/local/bin/mksh" ]
 then
 	export HISTFILE="$HOME/.ksh_history"
 	set -o emacs
 	bind ^L=clear-screen
-	if [ $COLOR -eq 1 ] ; then
-		set_prompt
-	else
-		set_basic_prompt
-	fi
 elif	[ $SHELL = "/bin/sh" ] && [ "$(uname)" = "FreeBSD" ] ; then
 	set -o emacs
 	export PS1="$(whoami)"'@\h:\w \$ '
-else
-	[ $SHELL = "/bin/sh" ] && export PS1="$ "
+elif	! [ -z "$BASH" ] ; then
+	export PROMPT_COMMAND="set_my_title"
 fi
 
 if [ $COLOR -eq 1 ] ; then
-- 
cgit v1.2.3