[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: system: Test for interactive shell instead of `cat` in skeleton '
From: |
Marius Bakke |
Subject: |
03/08: system: Test for interactive shell instead of `cat` in skeleton '.bashrc'. |
Date: |
Wed, 1 Nov 2017 16:35:32 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 0ab59dd8b8b64d4cd58c42a21e056a6cc8adc0bb
Author: Marius Bakke <address@hidden>
Date: Sun Oct 29 21:02:19 2017 +0100
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.
---
gnu/system/shadow.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 236807c..58613e6 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -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'.
- branch master updated (5010d0e -> 88b3501), Marius Bakke, 2017/11/01
- 01/08: gnu: Add perl-test-command., Marius Bakke, 2017/11/01
- 02/08: gnu: feh: Enable tests., Marius Bakke, 2017/11/01
- 03/08: system: Test for interactive shell instead of `cat` in skeleton '.bashrc'.,
Marius Bakke <=
- 04/08: system: Return early in skeleton '.bashrc' when the shell is non-interactive., Marius Bakke, 2017/11/01
- 06/08: gnu: libass: Update to 0.14.0., Marius Bakke, 2017/11/01
- 08/08: gnu: git: Update to 2.15.0., Marius Bakke, 2017/11/01
- 05/08: tests: ssh: Make sure we can run executables from PATH., Marius Bakke, 2017/11/01
- 07/08: gnu: imagemagick: Update to 6.9.9-21., Marius Bakke, 2017/11/01