Commit ef9eea1e authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Use an empty const for TMUX env-var when skipping auto-tmux 

An empty value does not interfere with normal manual client connections
the way a non-empty constant does.
parent ecc7b3e2

.profile

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ 
# Automatically run terminal multiplexer on SSH connect

case $TERM in

	screen*|tmux*) ;;

	*) [ -n "${SSH_TTY-}" ] && [ -z "${TMUX-}" ] && has tmux &&

	*)

		[ -n "${SSH_TTY-}" ] &&

		[ ${TMUX+set} = set ] &&

		[ -z "${TMUX-}" ] &&

		has tmux &&

		exec ~/.shell/bin/tmux-display-helper start-client ;;

esac

.shell/bin/tmux-display-helper

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ start_client() { 
		# exit code 1 means tmux-client cannot support this term type

		1)

			warn "Not starting Tmux due to an unsupported or unrecognised term type"

			exec env TMUX=skip ${CURRENT_SHELL-$SHELL} -l

			exec env TMUX= ${CURRENT_SHELL-$SHELL} -l

			;;

		*) return 1 ;;

	esac