git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generic handling of SSH_FORWARDED overrides.
[profile.git]
/
.profile.d
/
variables.bashrc
diff --git
a/.profile.d/variables.bashrc
b/.profile.d/variables.bashrc
index
3298c76
..
a4fda1e
100644
(file)
--- a/
.profile.d/variables.bashrc
+++ b/
.profile.d/variables.bashrc
@@
-1,11
+1,7
@@
-# $Id$
export SSHTERM=urxvtc
export SSHTERM_TITLE=-title
export SSHTERM_EXEC=-e
export SSHTERM=urxvtc
export SSHTERM_TITLE=-title
export SSHTERM_EXEC=-e
-#export TERM=xterm-xfree86
-export TERM=linux
unset LANG
unset LANG
-export LC_CTYPE=en_GB
if ls --help 2>/dev/null | grep gnu.org >/dev/null; then
export LS_OPTIONS="--color=auto -F -b --time-style=long-iso"
elif [ "$SYSTEM" = "Darwin" ]; then
if ls --help 2>/dev/null | grep gnu.org >/dev/null; then
export LS_OPTIONS="--color=auto -F -b --time-style=long-iso"
elif [ "$SYSTEM" = "Darwin" ]; then
@@
-28,5
+24,13
@@
elif [ $colours -gt 88 ]; then
else
export GREP_COLORS='cx=31:sl=:mt=33:fn=36:ln=34:bn=33:se=31'
fi
else
export GREP_COLORS='cx=31:sl=:mt=33:fn=36:ln=34:bn=33:se=31'
fi
-export SCREENDIR="$HOME/.screen/$HOSTNAME"
+
+# Override SCREENDIR iff screen is not setuid.
+screen=$(which screen &>/dev/null)
+if [ ! -z "$screen" ]; then
+ if ! ls -l "$screen" | cut -d ' ' -f 1 | grep s >/dev/null; then
+ export SCREENDIR="$HOME/.screen/$HOSTNAME"
+ fi
+fi
+unset screen
#mkdir -p "$SCREENDIR"
#mkdir -p "$SCREENDIR"