~ruther/guix-local: system: Test for interactive shell instead of `cat` in skeleton '.bashrc'.

0ab59dd8b8b64d4cd58c42a21e056a6cc8adc0bb — Marius Bakke 8 years ago 83a7a88

system: Test for interactive shell instead of `cat` in skeleton '.bashrc'.

* gnu/system/shadow.scm (default-skeletons)[bashrc]: Wrap $SSH_CLIENT test in
a conditional testing for interactive shell.

patch browse .tar.gz

1 files changed, 5 insertions(+), 6 deletions(-)

M gnu/system/shadow.scm

M gnu/system/shadow.scm => gnu/system/shadow.scm +5 -6

@@ 157,13 157,12 @@ if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n"))
 # honor it and otherwise use /bin/sh.
 export SHELL
 
-if [ -n \"$SSH_CLIENT\" -a -z \"`type -P cat`\" ]
+if [[ $- != *i* ]]
 then
-    # We are being invoked from a non-interactive SSH session
-    # (as in \"ssh host command\") but 'cat' cannot be found
-    # in $PATH.  Source /etc/profile so we get $PATH and other
-    # essential variables.
-    source /etc/profile
+    # We are being invoked from a non-interactive shell.  If this
+    # is an SSH session (as in \"ssh host command\"), source
+    # /etc/profile so we get PATH and other essential variables.
+    [[ -n \"$SSH_CLIENT\" ]] && source /etc/profile
 fi
 
 # Adjust the prompt depending on whether we're in 'guix environment'.