Commit: cfe1513f45cfc433f8a03b61196cb98b35fa4bc6 - wsh (hg)

Personal linux shell work environment

Commit MetaInfo

• Revisión: cfe1513f45cfc433f8a03b61196cb98b35fa4bc6 (tree)
• Tiempo: 2023-09-22 20:58:33
• Autor: Antoon Pardon <antoon.pardon@vub....>
• Commiter: Antoon Pardon

Log Message

Great renaming

Cambiar Resumen

• modified: install
• modified: wsh
• modified: xsh
• add: local-login
• add: local-startup
• add: screen-login
• add: shell-login
• add: shell-startup
• delete: localrc
• delete: shrc
• delete: wshrc

Diferencia incremental

diff -r aa67799714ba -r cfe1513f45cf install
--- a/install	Fri May 06 14:42:35 2022 +0200
+++ b/install	Fri Sep 22 13:58:33 2023 +0200
@@ -3,14 +3,21 @@
 set -e
 
 catch () {
-		echo "unexpected failure during installation"
-        echo "command '$BASH_COMMAND' failed"
-		rm $BASHRCHEADFILE
+	echo "unexpected failure during installation"
+	echo "command '$BASH_COMMAND' failed"
+	rm $BASHRCHEADFILE
 }
 
 trap "catch" ERR
 
-FILESTOINSTALL="localrc  screen  screenrc  shrc  su  vi  wsh  wshrc  xsh"
+if [ "${1:-NONE}" = '-f' ]
+then
+	FORCE=ON
+else
+	FORCE=OFF
+fi
+
+FILESTOINSTALL="local-startup local-login screen screenrc shell-startup shell-login su vi wsh screen-login xsh"
 
 TMPDIR=/tmp/$USER
 BASHRCHEADFILE=$TMPDIR/bashrchead.$$
@@ -51,10 +58,11 @@
 
 echo installing in $DESTINATION
 
-if ! mkdir ${DESTINATION}
+mkdir ${DESTINATION} 2> /dev/null || true
+if ! touch ${DESTINATION}/vi
 then
-	echo "Can't install wsh as ${HANDLE}"
-	exit 1
+	echo Unable to install
+	exit 2
 fi
 
 for file in $FILESTOINSTALL
@@ -67,8 +75,20 @@
 	chmod u+x ${DESTINATION}/$file
 done
 
-LOCALRC=$(hostname)rc
-cp ${DESTINATION}/localrc ${DESTINATION}/${LOCALRC}
+LOCAL_STARTUP=$(hostname)-startup
+LOCAL_LOGIN=$(hostname)-login
+if [ ! -f ${DESTINATION}/${LOCAL_STARTUP} ]
+then
+	cp ${DESTINATION}/local-startup ${DESTINATION}/${LOCAL_STARTUP}
+else
+	echo Already ${DESTINATION}/${LOCAL_STARTUP} present
+fi
+if [ ! -f ${DESTINATION}/${LOCAL_LOGIN} ]
+then
+	cp ${DESTINATION}/local-login ${DESTINATION}/${LOCAL_LOGIN}
+else
+	echo Already ${DESTINATION}/${LOCAL_LOGIN} present
+fi
 
 if [ ${PERMISION} = 'y' -o ${PERMISION} = 'Y' ]
 then

diff -r aa67799714ba -r cfe1513f45cf local-login
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/local-login	Fri Sep 22 13:58:33 2023 +0200
@@ -0,0 +1,5 @@
+
+#TERM=${TERM%-*}
+#LANG=${LANG%.*}.UTF-8
+
+#PATH=$PATH:$HOME/bin

diff -r aa67799714ba -r cfe1513f45cf local-startup
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/local-startup	Fri Sep 22 13:58:33 2023 +0200
@@ -0,0 +1,5 @@
+
+
+alias lx='ls -xF'
+alias ll='ls -l'
+

diff -r aa67799714ba -r cfe1513f45cf localrc
--- a/localrc	Fri May 06 14:42:35 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-
-#TERM=${TERM%-*}
-#LANG=${LANG%.*}.UTF-8
-
-PATHTAIL=$HOME/bin
-
-PS1='bash$ '
-cd () {
-	builtin cd "$@"
-	screen -X title $( builtin pwd )
-}
-
-screen -X title $( builtin pwd )

diff -r aa67799714ba -r cfe1513f45cf screen-login
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screen-login	Fri Sep 22 13:58:33 2023 +0200
@@ -0,0 +1,3 @@
+. $HOME/.%HANDLE%/shell-login
+
+exec $RCRT/screen -d -RR %HANDLE%

diff -r aa67799714ba -r cfe1513f45cf shell-login
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shell-login	Fri Sep 22 13:58:33 2023 +0200
@@ -0,0 +1,17 @@
+
+HOSTNAME=$(hostname)
+SHELL=/bin/bash
+
+RCRT=${HOME}/.%HANDLE%
+SHRC=${RCRT}/shell-startup
+
+LOCAL_STARTUP=${RCRT}/${HOSTNAME}-startup
+LOCAL_LOGIN=${RCRT}/${HOSTNAME}-login
+
+. ${LOCAL_LOGIN}
+. ${SHRC}
+
+stty erase ^H quit ^?
+STTY=$(stty -g)
+
+export HOSTNAME USER PATH RCRT SHRC XTERMTITLE TITLESTACK STTY SHELL LOCAL_STARTUP LOCAL_LOGIN

diff -r aa67799714ba -r cfe1513f45cf shell-startup
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shell-startup	Fri Sep 22 13:58:33 2023 +0200
@@ -0,0 +1,104 @@
+#
+# alternative bashrc for when logining in remotely to get the same environment wherever I login. 
+#
+# If I want to keep the same environment whenever I start a new bash shell, needs adaptions
+# in .bashrc. Something like the following:
+#
+# if [ "${SHRC:-NONE}" != "NONE" ]
+# then
+#     . "${SHRC}"
+#     return
+# fi
+# do the normal bashrc stuff
+#
+
+
+# localrc should at least provide PATHTAIL
+
+. ${LOCAL_STARTUP}
+
+
+alias screen=$RCRT/screen
+alias vi=$RCRT/vi
+alias xsh=$RCRT/xsh
+alias wsh=$RCRT/wsh
+alias rst='stty $STTY'
+
+if [ "${XTERMTITLE:-__}" = "__" ]
+then
+	if [ "$USER" = "root" ]
+	then
+		XTERMTITLE=$(echo root@${HOSTNAME} | tr '[:lower:]' '[:upper:]' )
+	else
+		XTERMTITLE=${USER}@${HOSTNAME}
+	fi
+	TITLESTACK=$XTERMTITLE
+fi
+
+xterm-title () {
+	if [ $# -ne 0 ]
+	then
+		XTERMTITLE="$*"
+	fi
+	echo -en "\e]0;$XTERMTITLE\a"
+}
+
+push-title () {
+	TITLESTACK=$TITLESTACK:$XTERMTITLE
+	xterm-title $*
+}
+
+pop-title () {
+	XTERMTITLE=${TITLESTACK##*:}
+	TITLESTACK=${TITLESTACK%:*}
+	xterm-title
+}
+
+if [ "${STY:-NONE}" != "NONE" ]
+then
+	make-screen-title () {
+		PWD=$( builtin pwd )
+		BRANCH=$( command git branch --show-current 2> /dev/null )
+		if [ "$BRANCH" != "" ]
+		then
+			BRANCH="[GIT] $BRANCH"
+		else
+			BRANCH=$( command hg branch 2> /dev/null )
+			if [ "$BRANCH" != "" ]
+			then
+				BRANCH="[HG] $BRANCH"
+			fi
+		fi
+		screen -X title "$PWD $BRANCH"
+	}
+
+	function git() {
+		command git "$@"
+		make-screen-title
+	}
+
+	function hg() {
+		command hg "$@"
+		make-screen-title
+	}
+			
+
+	PS1='bash$ '
+	cd () {
+		builtin cd "$@"
+		make-screen-title
+	}
+
+	pushd () {
+		builtin pushd "$@"
+		make-screen-title
+	}
+
+	popd () {
+		builtin popd "$@"
+		make-screen-title
+	}
+
+	cd .
+fi
+

diff -r aa67799714ba -r cfe1513f45cf shrc
--- a/shrc	Fri May 06 14:42:35 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-#
-# alternative bashrc for when logining in remotely to get the same environment wherever I login. 
-#
-# If I want to keep the same environment whenever I start a new bash shell, needs adaptions
-# in .bashrc. Something like the following:
-#
-# if [ "${SHRC:-NONE}" != "NONE" ]
-# then
-#     . "${SHRC}"
-#     return
-# fi
-# do the normal bashrc stuff
-#
-
-HOSTNAME=$(hostname)
-SHELL=/bin/bash
-
-RCRT=$HOME/.%HANDLE%
-SHRC=$RCRT/shrc
-LOCALRC=${RCRT}/${HOSTNAME}rc
-
-# localrc should at least provide PATHTAIL
-
-. ${LOCALRC}
-
-PATH=${PATH%%:$PATHTAIL}:$PATHTAIL
-
-alias su=$RCRT/su
-alias screen=$RCRT/screen
-alias vi=$RCRT/vi
-alias xsh=$RCRT/xsh
-alias wsh=$RCRT/wsh
-alias rst='stty $STTY'
-
-alias lx='ls -xF'
-alias ll='ls -l'
-
-if [ "${XTERMTITLE:-__}" = "__" ]
-then
-	if [ "$USER" = "root" ]
-	then
-		XTERMTITLE=$(echo root@${HOSTNAME} | tr '[:lower:]' '[:upper:]' )
-	else
-		XTERMTITLE=${USER}@${HOSTNAME}
-	fi
-	TITLESTACK=$XTERMTITLE
-fi
-
-xterm-title () {
-	if [ $# -ne 0 ]
-	then
-		XTERMTITLE="$*"
-	fi
-	echo -en "\e]0;$XTERMTITLE\a"
-}
-
-push-title () {
-	TITLESTACK=$TITLESTACK:$XTERMTITLE
-	xterm-title $*
-}
-
-pop-title () {
-	XTERMTITLE=${TITLESTACK##*:}
-	TITLESTACK=${TITLESTACK%:*}
-	xterm-title
-}
-
-
-if [ "${STTY:-__}" = "__" ]
-then
-	if tty -s
-	then
-		stty erase ^H quit ^?
-		STTY=$(stty -g)
-		xterm-title
-	fi
-fi
-
-export HOSTNAME USER PATH SHRC XTERMTITLE TITLESTACK STTY SHELL

diff -r aa67799714ba -r cfe1513f45cf wsh
--- a/wsh	Fri May 06 14:42:35 2022 +0200
+++ b/wsh	Fri Sep 22 13:58:33 2023 +0200
@@ -2,6 +2,6 @@
 
 . "${SHRC}"
 
-ssh -t "$@" 'exec bash --rcfile $HOME/.%HANDLE%/wshrc'; status=$?
+ssh -t "$@" 'exec bash --rcfile $HOME/.%HANDLE%/screen-login'; status=$?
 xterm-title
 exit $status

diff -r aa67799714ba -r cfe1513f45cf wshrc
--- a/wshrc	Fri May 06 14:42:35 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-. $HOME/.%HANDLE%/shrc
-
-exec $RCRT/screen -d -RR %HANDLE%

diff -r aa67799714ba -r cfe1513f45cf xsh
--- a/xsh	Fri May 06 14:42:35 2022 +0200
+++ b/xsh	Fri Sep 22 13:58:33 2023 +0200
@@ -2,6 +2,6 @@
 
 . "${SHRC}"
 
-ssh -t "$@" 'exec bash --rcfile $HOME/.%HANDLE%/shrc'; status=$?
+ssh -t "$@" 'exec bash --rcfile $HOME/.%HANDLE%/shell-login'; status=$?
 xterm-title
 exit $status