From 9cd36d3ea1d60ec9b8eea52306f7a55665fbd8f5 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Wed, 23 Dec 2020 16:57:42 -0500
Subject: Switch from 1sh to dash

---
 home/.shrc | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/home/.shrc b/home/.shrc
index 78d9e9f3..bf3e0dfe 100644
--- a/home/.shrc
+++ b/home/.shrc
@@ -1,6 +1,5 @@
 set -o noclobber -o nounset -o vi
 
-HISTFILE=~/.history
 CDPATH=:~
 
 alias vim=$EDITOR
@@ -20,15 +19,15 @@ type doas >/dev/null 2>&1 && alias sudo=doas
 cd() {
 	local path
 	if [ $# -eq 0 ]; then
-		builtin cd
+		command cd
 	elif [ "${1%%:*}" != "$1" ]; then
 		path=${1#*:}
 		[ -n "${path}" ] || path=${PWD#${HOME}/}
 		SSH_CD=$path ssh -o SendEnv=SSH_CD "${1%%:*}"
 	elif [ -e "$1" -a ! -d "$1" ]; then
-		builtin cd "${1%/*}" && $EDITOR "${1##*/}"
+		command cd "${1%/*}" && $EDITOR "${1##*/}"
 	else
-		builtin cd "$@"
+		command cd "$@"
 	fi
 }
 if [ -n "${SSH_CD:-}" ]; then
@@ -36,12 +35,15 @@ if [ -n "${SSH_CD:-}" ]; then
 	unset SSH_CD
 fi
 
-PS0=$'\n'
-PS1='\$ '
-RPS1="\? ${SSH_CLIENT:+\h:}\w"
-
-if [ "${TERM%-*}" = 'xterm' ]; then
-	tsl=$'\e]0;'
-	fsl=$'\e\\'
-	PS0="${tsl}${SSH_CLIENT:+\h:}\W${fsl}${PS0}"
-fi
+hostname=$(hostname -s)
+rprompt() {
+	local pwd
+	pwd=${PWD#${HOME}}
+	[ "${pwd}" != "${PWD}" ] && pwd="~${pwd}"
+	[ "${TERM%-*}" = 'xterm' ] \
+		&& printf '\33]0;%s\a' "${SSH_CLIENT:+${hostname}:}${pwd##*/}" >&2
+	printf '%s' "${SSH_CLIENT:+${hostname}:}${pwd}"
+}
+PS1='
+$ '
+RPS1='${?#0} $(rprompt)'
-- 
cgit 1.4.1