etc/profile.d/pdsh.sh

diff --git a/etc/profile b/etc/profile
index 876ee9e6672bfb9d8976441f3778ed204a970aff..aa0d6f0fefe01bb208c85212c2460c5b9a4d1a2e 100755 (executable)
--- a/etc/profile
+++ b/etc/profile
@@ -98,7 +98,8 @@ fi
 if [ -z "$NB_ETC_DIR" -o "$NB_ETC_DIR" = "/" ]; then
        export NB_UNSUPORTED=1
        nb_debug "ERR: Unsupported shell. Please use bash, ksh93 or zsh."
-       _nb_unset; return 71
+       _nb_unset
+       return 71
 
 fi
 unset NB_UNSUPORTED

diff --git a/etc/profile.d/pdsh.sh b/etc/profile.d/pdsh.sh
index aedc26c647b66f60b0464247d1a6c348a88581a5..e30b195bd21e5a8d57c83df89f9b5a555ea2e255 100644 (file)
--- a/etc/profile.d/pdsh.sh
+++ b/etc/profile.d/pdsh.sh
@@ -6,7 +6,7 @@ export PDSH_SSH_ARGS="-q"
 
 [ -r ~/.pdsh.hosts ] && export WCOLL=~/.pdsh.hosts
 
-[ "$SHELL" = "/bin/sh" ] && return 0
+[ "$SHELL" = "/bin/bash" ] || return 0
 pdsh_quiet() {
        exec 3> >(grep -Ev '^(pdsh@|[^ :]+: (stdio forwarding failed|channel [0-9]+: open failed))')
        pdsh $@ 2>&3