Changeset 584 for CMT/HEAD

Timestamp:

Jun 30, 2011, 11:24:14 AM (13 years ago)

Author:

rybkin

Message:

See C.L. 462

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• src/setup.csh (modified) (1 diff)
• src/setup.sh (modified) (1 diff)
• src/setup.zsh (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-06-27    <rybkin@lal.in2p3.fr> 462
+
+        * src/setup.zsh: Do not execute if zsh is invoked in other shell (e.g.,
+        sh, ksh) compatibility mode
+        * src/setup.sh: Do not test for zsh with string leading to syntax error
+        in other shells (as POSIX conformant non-interactive shell exits, case
+        with BASH versions > 4), define command completions for interactive shell
+        only
+        * src/setup.csh: Define command completions for interactive shell only
+        
 2011-06-22    <rybkin@lal.in2p3.fr> 461
 

CMT/HEAD/src/setup.csh

@@ -11 +11 @@
 endif
 
+if ( $?0 == 0 ) then
 if ( $?tcsh == 1 || `basename "$shell"` == "tcsh" ) then
   source ${CMTROOT}/src/setup.tcsh
+endif
 endif
 

CMT/HEAD/src/setup.sh

@@ -11 +11 @@
 fi
 
-
-eval function b {} 1>/dev/null 2>&1
-if test "$?" = "0"; then
-. ${CMTROOT}/src/setup.zsh
+if [ `expr $- : '.*i'` -ne 0 ]; then
+if [ -n "${ZSH_NAME-}" ]; then
+  . ${CMTROOT}/src/setup.zsh
+fi
 fi
 

CMT/HEAD/src/setup.zsh

@@ -5 +5 @@
 # See the complete license in cmt_license.txt "http://www.cecill.info". 
 #-----------------------------------------------------------
+
+[ -z "${ARGC-}" ] && return
 
 function cmt_macros { reply=(`cmt -quiet show macro_names`)}; \