diff options
| author | Bobby Powers <bpowers@forio.com> | 2010-11-23 05:22:11 (GMT) |
|---|---|---|
| committer | Bobby Powers <bpowers@forio.com> | 2010-11-23 05:22:11 (GMT) |
| commit | af7aee64ac71c7c8f3d38e7fb9bcda3153a07410 (patch) | |
| tree | 94e738f3fd3e401029801d08e6c7009444c49266 | |
| parent | 8aa546c0c981070f6adfd10a68e2fc6cf82e62de (diff) | |
rainbow-easy: whitelist TERM
without TERM, nano refuses to start in the shell
| -rwxr-xr-x | bin/rainbow-easy | 5 | ||||
| -rwxr-xr-x | bin/rainbow-xify | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/bin/rainbow-easy b/bin/rainbow-easy index cdcef8d..f19716f 100755 --- a/bin/rainbow-easy +++ b/bin/rainbow-easy @@ -29,6 +29,10 @@ if [ -z "$DISPLAY" ]; then DISPLAY=`read_parent_envvar DISPLAY` fi +if [ -z "$TERM" ]; then + DISPLAY=`read_parent_envvar TERM` +fi + exec /usr/sbin/rainbow-run \ -q \ -s /var/spool/rainbow/2 \ @@ -36,6 +40,7 @@ exec /usr/sbin/rainbow-run \ -f 0 -f 1 -f 2 \ -i "${SUDO_USER}_${ID}" \ -E "DISPLAY=$DISPLAY" \ + -E "TERM=$TERM" \ -E "XAUTHORITY=${XAUTHORITY:-${HOME}/.Xauthority}" \ -E "PATH=${PARENT_PATH}" \ -a /usr/bin/rainbow-xify \ diff --git a/bin/rainbow-xify b/bin/rainbow-xify index c2f633e..e87f039 100755 --- a/bin/rainbow-xify +++ b/bin/rainbow-xify @@ -3,7 +3,7 @@ import sys import pwd -from os import getuid, getgid, environ, chmod, chown +from os import getuid, getgid, environ, chmod, chown, chdir from os.path import join, isdir, dirname, exists from optparse import OptionParser from shutil import copyfile @@ -67,8 +67,9 @@ def main(): write_envvar('USER', i.pw_name) write_envvar('HOME', h_i) #write_envvar('TMPDIR', join(h_i, 'tmp')) - if 'DISPLAY' in environ: - write_envvar('DISPLAY', environ['DISPLAY']) + for var in ['DISPLAY', 'TERM']: + if var in environ: + write_envvar(var, environ[var]) if __name__ == '__main__': main() |