Fix up title handling and set it by default in prompts

1 files changed, 7 insertions, 10 deletions

diff --git a/kshrc b/kshrc
index 4f4d486..a51da08 100644
--- a/kshrc
+++ b/kshrc
@@ -246,9 +246,9 @@ _ret=$?
 
 setPrompt() {
 case $1 in
-date) export PS1='$(date "+%m.%d %H:%M") `nzret`\$ ' ;;
-time) export PS1='$(date "+%H:%M") `nzret`\$ ' ;;
-basic) export PS1='`nzret`\$ ' ;;
+date) export PS1='$(date "+%m.%d %H:%M") `set_my_title``nzret`\$ ' ;;
+time) export PS1='$(date "+%H:%M") `set_my_title``nzret`\$ ' ;;
+basic) export PS1='`set_my_title``nzret`\$ ' ;;
 esac
 }
 
@@ -273,14 +273,11 @@ unset _passDir
 }
 
 set_title() {
-	printf $'\033]0;'"%s"$'\007' "$1"
+	printf '\033]0;'"%s"'\007' "$1"
 }
 
 set_my_title() {
-	_load="Load Avg: $(_sys_load)"
-	_free_mem="M Free: $(_sys_memory)"
-	_uptime="Uptime: $(_sys_uptime)"
-	set_title "$(id -un)[$(hostname)] -- $_load $_free_mem $_uptime"
+	set_title "$(id -un)@$(hostname 2>/dev/null || cat /etc/hostname 2>/dev/null || cat /etc/myname 2>/dev/null)"
 }
 
 _sys_memory() {
@@ -572,10 +569,10 @@ elif [ -n "$KSH_VERSION" ] ; then
 
 	# if you want PWD
 	# export PS1='`nzret`\u@\h \$PWD \$ '
-	export PS1='`nzret`\u@\h\$ '
+	export PS1='`set_my_title``nzret`\u@\h\$ '
 
 	if [ "$(id -u)" -eq 0 ] ; then
-		export PS1='`nzret`\h\$ '
+		export PS1='`set_my_title``nzret`\h\$ '
 	fi
 
 elif	[ "$SHELL" = "/bin/sh" ] && [ "$(uname)" = "FreeBSD" ] ; then