env-switcher-cvs Mailing List for Environment Switcher (Page 5)

Brought to you by: donginn, jsquyres

env-switcher-cvs — CVS activity for env-switcher

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr (5)	_May (37)	_Jun (2)	_Jul (7)	_Aug (12)	_Sep (6)	_Oct (32)	_Nov	_Dec
2003	_Jan	_Feb (1)	_Mar	_Apr	_May	_Jun	_Jul (8)	_Aug	_Sep	_Oct	_Nov	_Dec
2004	_Jan (11)	_Feb	_Mar (15)	_Apr	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb (6)	_Mar (2)	_Apr	_May	_Jun	_Jul	_Aug	_Sep (1)	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 3 4 5 6 > >> (Page 5 of 6)

[env-switcher-cvs] CVS: env-switcher/dist buildrpm.sh,1.2,1.3

From: Jeff S. <jsq...@us...> - 2002-07-27 19:56:31

Update of /cvsroot/env-switcher/env-switcher/dist
In directory usw-pr-cvs1:/tmp/cvs-serv30001/dist

Modified Files:
	buildrpm.sh 
Log Message:
Make the RPM install into /opt/env-switcher (vs. /opt/env-switcher-$version)
so that we don't lose switcher.ini when we rpm -Uvh


Index: buildrpm.sh
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/buildrpm.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** buildrpm.sh	27 Apr 2002 18:58:21 -0000	1.2
--- buildrpm.sh	27 Jul 2002 19:56:28 -0000	1.3
***************
*** 47,51 ****
  #
  
! oscar_prefix="$oscar_prefix-$version"
  echo "--> Using prefix: $oscar_prefix"
  
--- 47,56 ----
  #
  
! # We want to install to /opt/env-switcher
! # (vs. /opt/env-switcher-$version) because otherwise, we'll lose
! # switcher.ini for every new version of the rpm that gets installed
! # (e.g., rpm -Uvh).
! 
! #oscar_prefix="$oscar_prefix-$version"
  echo "--> Using prefix: $oscar_prefix"

[env-switcher-cvs] CVS: env-switcher autogen.sh,1.1,1.2

From: Jeff S. <jsq...@us...> - 2002-07-27 19:55:38

Update of /cvsroot/env-switcher/env-switcher
In directory usw-pr-cvs1:/tmp/cvs-serv29969

Modified Files:
	autogen.sh 
Log Message:
Use --copy with automake; it's just nicer


Index: autogen.sh
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** autogen.sh	23 Apr 2002 06:22:55 -0000	1.1
--- autogen.sh	27 Jul 2002 19:55:35 -0000	1.2
***************
*** 85,89 ****
  #run_and_check autoheader
  run_and_check autoconf
! run_and_check automake -a
  
  exit 0
--- 85,89 ----
  #run_and_check autoheader
  run_and_check autoconf
! run_and_check automake -a --copy
  
  exit 0

[env-switcher-cvs] CVS: modules-oscar autogen.sh,1.1,1.2

From: Jeff S. <jsq...@us...> - 2002-06-20 06:57:32

Update of /cvsroot/env-switcher/modules-oscar
In directory usw-pr-cvs1:/tmp/cvs-serv12983

Modified Files:
	autogen.sh 
Log Message:
use --copy to avoid annoying sym links


Index: autogen.sh
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** autogen.sh	23 Apr 2002 06:04:52 -0000	1.1
--- autogen.sh	20 Jun 2002 06:57:27 -0000	1.2
***************
*** 85,89 ****
  #run_and_check autoheader
  run_and_check autoconf
! run_and_check automake -a
  
  exit 0
--- 85,89 ----
  #run_and_check autoheader
  run_and_check autoconf
! run_and_check automake -a --copy
  
  exit 0

[env-switcher-cvs] CVS: modules-oscar/src oscar.tcl,1.4,1.5

From: Jeff S. <jsq...@us...> - 2002-06-20 06:56:31

Update of /cvsroot/env-switcher/modules-oscar/src
In directory usw-pr-cvs1:/tmp/cvs-serv12814/modules-oscar/src

Modified Files:
	oscar.tcl 
Log Message:
Add -nocomplain so that we don't complain if oscar-modulefiles dir is empty


Index: oscar.tcl
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/src/oscar.tcl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** oscar.tcl	24 May 2002 03:50:57 -0000	1.4
--- oscar.tcl	20 Jun 2002 06:56:28 -0000	1.5
***************
*** 38,42 ****
  # in $omdir.
  
! foreach modulefile [glob $omdir/*] { 
    module load [file tail $modulefile] 
  }
--- 38,42 ----
  # in $omdir.
  
! foreach modulefile [glob -nocomplain $omdir/*] { 
    module load [file tail $modulefile] 
  }

[env-switcher-cvs] CVS: modules-oscar/dist VERSION,1.3,1.4 modules-oscar.spec,1.7,1.8

From: Jeff S. <jsq...@us...> - 2002-05-24 07:12:13

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory usw-pr-cvs1:/tmp/cvs-serv15022/dist

Modified Files:
	VERSION modules-oscar.spec 
Log Message:
Bump up the version numbers


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/VERSION,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** VERSION	24 May 2002 05:16:55 -0000	1.3
--- VERSION	24 May 2002 07:12:09 -0000	1.4
***************
*** 1,5 ****
  major=1
  minor=0
! release=2
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=3
  alpha=0
  beta=0

Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** modules-oscar.spec	24 May 2002 06:44:59 -0000	1.7
--- modules-oscar.spec	24 May 2002 07:12:09 -0000	1.8
***************
*** 25,29 ****
  Name: modules
  Version: 3.1.6
! Release: 7oscar
  License: GPL
  Group: Applications/Environment
--- 25,29 ----
  Name: modules
  Version: 3.1.6
! Release: 8oscar
  License: GPL
  Group: Applications/Environment

[env-switcher-cvs] CVS: env-switcher/dist VERSION,1.3,1.4

From: Jeff S. <jsq...@us...> - 2002-05-24 07:10:09

Update of /cvsroot/env-switcher/env-switcher/dist
In directory usw-pr-cvs1:/tmp/cvs-serv14677

Modified Files:
	VERSION 
Log Message:
Bump up to version 1.0.4


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/VERSION,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** VERSION	21 May 2002 02:40:32 -0000	1.3
--- VERSION	24 May 2002 07:10:06 -0000	1.4
***************
*** 1,5 ****
  major=1
  minor=0
! release=3
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=4
  alpha=0
  beta=0

[env-switcher-cvs] CVS: env-switcher/src switcher.tcl.in,1.5,1.6

From: Jeff S. <jsq...@us...> - 2002-05-24 06:56:03

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv11320

Modified Files:
	switcher.tcl.in 
Log Message:
Note that we also modify the MANPATH


Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** switcher.tcl.in	24 May 2002 01:53:34 -0000	1.5
--- switcher.tcl.in	24 May 2002 06:55:59 -0000	1.6
***************
*** 15,19 ****
    puts stderr "\tIt also adds the following path to the path:"
    puts stderr "\t\t@SWITCHER_BINDIR@"
! 
  }
  
--- 15,20 ----
    puts stderr "\tIt also adds the following path to the path:"
    puts stderr "\t\t@SWITCHER_BINDIR@"
!   puts stderr "\tIt also adds the following path to the man path:"
!   puts stderr "\t\t@SWITCHER_MANDIR@"
  }

[env-switcher-cvs] CVS: modules-oscar/dist modules-oscar.spec,1.6,1.7

From: Jeff S. <jsq...@us...> - 2002-05-24 06:45:03

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory usw-pr-cvs1:/tmp/cvs-serv8215/modules-oscar/dist

Modified Files:
	modules-oscar.spec 
Log Message:
Fix env-switcher bug 559978.  Make "rpm -Uvh" be able to occur cleanly --
need to delineate between the additions to /etc/bashrc and /etc/csh.cshrc 
from the old RPM and the new RPM.


Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** modules-oscar.spec	24 May 2002 03:53:03 -0000	1.6
--- modules-oscar.spec	24 May 2002 06:44:59 -0000	1.7
***************
*** 259,271 ****
  #   /etc/bashrc is run, and all /etc/profile.d/*.sh scripts are run
  
  %__cp /etc/bashrc /etc/bashrc.rpmsave
! egrep -v '^.*# MODULES-RPM-ADDITION' /etc/bashrc > /etc/bashrc.tmp
! %__cat >> /etc/bashrc.tmp <<EOF
! if test "\$MODULE_OSCAR" = "" -a -f %{_profiledir}/00-modules.sh; then   # MODULES-RPM-ADDITION
!         . %{_profiledir}/00-modules.sh          # MODULES-RPM-ADDITION
! fi                                              # MODULES-RPM-ADDITION
  EOF
- %__cp /etc/bashrc.tmp /etc/bashrc
- %__rm -f /etc/bashrc.tmp
  
  # We have to do essentially the same thing for /etc/csh.cshrc for
--- 259,270 ----
  #   /etc/bashrc is run, and all /etc/profile.d/*.sh scripts are run
  
+ special_string="MODULES-%{version}-%{release}-RPM-ADDITION"
+ 
  %__cp /etc/bashrc /etc/bashrc.rpmsave
! %__cat >> /etc/bashrc <<EOF
! if test "\$MODULE_OSCAR" = "" -a -f %{_profiledir}/00-modules.sh; then   # $special_string
!         . %{_profiledir}/00-modules.sh          # $special_string
! fi                                              # $special_string
  EOF
  
  # We have to do essentially the same thing for /etc/csh.cshrc for
***************
*** 273,284 ****
  
  %__cp /etc/csh.cshrc /etc/csh.cshrc.rpmsave
! egrep -v '^.*# MODULES-RPM-ADDITION' /etc/csh.cshrc > /etc/csh.cshrc.tmp
! %__cat >> /etc/csh.cshrc.tmp <<EOF
! if ("\$?MODULE_OSCAR" == "0" && -f %{_profiledir}/00-modules.csh) then   # MODULES-RPM-ADDITION
!         source %{_profiledir}/00-modules.csh    # MODULES-RPM-ADDITION
! endif                                           # MODULES-RPM-ADDITION
  EOF
! %__cp /etc/csh.cshrc.tmp /etc/csh.cshrc
! %__rm -f /etc/csh.cshrc.tmp
  
  
--- 272,282 ----
  
  %__cp /etc/csh.cshrc /etc/csh.cshrc.rpmsave
! %__cat >> /etc/csh.cshrc <<EOF
! if ("\$?MODULE_OSCAR" == "0" && -f %{_profiledir}/00-modules.csh) then   # $special_string
!         source %{_profiledir}/00-modules.csh    # $special_string
! endif                                           # $special_string
  EOF
! 
! unset special_string
  
  
***************
*** 290,296 ****
  %postun
  
  # Remove the addition that we put in the /etc/bashrc file in %post.
  
! egrep -v '^.*# MODULES-RPM-ADDITION' /etc/bashrc > /etc/bashrc.tmp
  %__cp /etc/bashrc.tmp /etc/bashrc
  %__rm -f /etc/bashrc.tmp
--- 288,296 ----
  %postun
  
+ special_string="MODULES-%{version}-%{release}-RPM-ADDITION"
+ 
  # Remove the addition that we put in the /etc/bashrc file in %post.
  
! egrep -v '^.*# '$special_string /etc/bashrc > /etc/bashrc.tmp
  %__cp /etc/bashrc.tmp /etc/bashrc
  %__rm -f /etc/bashrc.tmp
***************
*** 298,302 ****
  # Ditto for /etc/csh.cshrc
  
! egrep -v '^.*# MODULES-RPM-ADDITION' /etc/csh.cshrc > /etc/csh.cshrc.tmp
  %__cp /etc/csh.cshrc.tmp /etc/csh.cshrc
  %__rm -f /etc/csh.cshrc.tmp
--- 298,302 ----
  # Ditto for /etc/csh.cshrc
  
! egrep -v '^.*# '$special_string /etc/csh.cshrc > /etc/csh.cshrc.tmp
  %__cp /etc/csh.cshrc.tmp /etc/csh.cshrc
  %__rm -f /etc/csh.cshrc.tmp

[env-switcher-cvs] CVS: env-switcher/man .cvsignore,NONE,1.1

From: Jeff S. <jsq...@us...> - 2002-05-24 05:27:34

Update of /cvsroot/env-switcher/env-switcher/man
In directory usw-pr-cvs1:/tmp/cvs-serv27637

Added Files:
	.cvsignore 
Log Message:
Add a .cvsignore file


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

[env-switcher-cvs] CVS: modules-oscar/src 00-modules.csh,1.1,1.2 00-modules.sh,1.1,1.2

From: Jeff S. <jsq...@us...> - 2002-05-24 05:20:09

Update of /cvsroot/env-switcher/modules-oscar/src
In directory usw-pr-cvs1:/tmp/cvs-serv26624/src

Modified Files:
	00-modules.csh 00-modules.sh 
Log Message:
addressing env-switcher bug 559634:
If we switch users (e.g., "su") or shells, we need to do a hard reset of
the entire modules package.  This means unsetting a whole schload of
environment variables so that modules will completely re-initialize itself.
If these env vars are not unset, modules will only "soft" reset itself,
which can have some undesired side-effects, such as attemping to modify
the $HOME/.modulesbeginenv of the *old* user (i.e., the pre-su user).


Index: 00-modules.csh
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/src/00-modules.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 00-modules.csh	23 Apr 2002 06:04:52 -0000	1.1
--- 00-modules.csh	24 May 2002 05:20:06 -0000	1.2
***************
*** 12,28 ****
      set MODULE_OSCAR=foo
  
!     # The "su" problem.  If user with one default shell does "su" to a
!     # user with a different shell, we have to force modules to
!     # re-initialize.  So we keep a special $MODULE_SHELL variable set to
!     # the major flavor of shell that we came from (sh or csh).  
  
!     # In this file, if we see that $MODULE_SHELL is not "csh", then
!     # unsetenv MODULE_VERSION, which will trigger modules to be setup
!     # again.
  
!     if ($?MODULE_SHELL == 1) then
  	if ("$MODULE_SHELL" != "csh") then
! 	    unsetenv MODULE_VERSION
  	endif
      endif
      setenv MODULE_SHELL "csh"
--- 12,43 ----
      set MODULE_OSCAR=foo
  
!     # If we change users (e.g., "su") or change shells, we need to
!     # reset everything.
  
!     set MODULE_OSCAR_NEED_RESET=0
  
!     # Keep a record of who the user who is that we setup for.  If it
!     # changed, set MODULE_OSCAR_NEED_RESET.  Likewise, if MODULE_SHELL
!     # is not "csh", then we also need a full reset.
! 
!     set MODULE_OSCAR_USER_NOW="`whoami`"
!     if ($?MODULE_OSCAR_USER == 0) set MODULE_OSCAR_USER=
!     if ("$MODULE_OSCAR_USER" != "$MODULE_OSCAR_USER_NOW") then
! 	setenv MODULE_OSCAR_USER "$MODULE_OSCAR_USER_NOW"
! 	set MODULE_OSCAR_NEED_RESET=1
!     else if ($?MODULE_SHELL == 1) then
  	if ("$MODULE_SHELL" != "csh") then
! 	    set MODULE_OSCAR_NEED_RESET=1
  	endif
+     endif
+ 
+     # This list of variables to unset is highly specific to version
+     # 3.1.6 of modules.  If there is ever a new version of modules,
+     # we'll need to ensure that this list of variables is still
+     # correct.
+ 
+     if ("$MODULE_OSCAR_NEED_RESET" == "1") then
+ 	unsetenv MODULE_VERSION MODULEPATH LOADEDMODULES MODULESHOME \
+ 	    _LMFILES_ MODULE_VERSION_STACK MODULE_VERSION _MODULESBEGINENV_
      endif
      setenv MODULE_SHELL "csh"

Index: 00-modules.sh
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/src/00-modules.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 00-modules.sh	23 Apr 2002 06:04:52 -0000	1.1
--- 00-modules.sh	24 May 2002 05:20:06 -0000	1.2
***************
*** 12,29 ****
      MODULE_OSCAR=foo
  
!     # The "su" problem.  If user with one default shell does "su" to a
!     # user with a different shell, we have to force modules to
!     # re-initialize.  So we keep a special $MODULE_SHELL variable set to
!     # the major flavor of shell that we came from (sh or csh).  
!    
!     # In this file, if we see that $MODULE_SHELL is not "sh", then
!     # unsetenv MODULE_VERSION, which will trigger modules to be setup
!     # again.
  
!     if test "$MODULE_SHELL" != "sh"; then
! 	MODULE_VERSION=
      fi
!     MODULE_SHELL=sh
!     export MODULE_SHELL
  
      # NOTE: Because the RH 7.x /etc/bashrc sucks, the csh init file
--- 12,42 ----
      MODULE_OSCAR=foo
  
!     # If we change users (e.g., "su") or change shells, we need to
!     # reset everything.
  
!     MODULE_OSCAR_NEED_RESET=0
! 
!     # Keep a record of who the user who is that we setup for.  If it
!     # changed, set MODULE_OSCAR_NEED_RESET.  Likewise, if MODULE_SHELL
!     # is not "csh", then we also need a full reset.
! 
!     MODULE_OSCAR_USER_NOW="`whoami`"
!     if test "$MODULE_OSCAR_USER" != "$MODULE_OSCAR_USER_NOW"; then
! 	export MODULE_OSCAR_USER="$MODULE_OSCAR_USER_NOW"
! 	MODULE_OSCAR_NEED_RESET=1
!     elif test "$MODULE_SHELL" != "sh"; then
! 	MODULE_OSCAR_NEED_RESET=1
!     fi
! 
!     # This list of variables to unset is highly specific to version
!     # 3.1.6 of modules.  If there is ever a new version of modules,
!     # we'll need to ensure that this list of variables is still
!     # correct.
! 
!     if test "$MODULE_OSCAR_NEED_RESET" = "1"; then
! 	unset MODULE_VERSION MODULEPATH LOADEDMODULES MODULESHOME \
! 	    _LMFILES_ MODULE_VERSION_STACK MODULE_VERSION _MODULESBEGINENV_
      fi
!     export MODULE_SHELL=sh
  
      # NOTE: Because the RH 7.x /etc/bashrc sucks, the csh init file

[env-switcher-cvs] CVS: modules-oscar/dist VERSION,1.2,1.3

From: Jeff S. <jsq...@us...> - 2002-05-24 05:16:58

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory usw-pr-cvs1:/tmp/cvs-serv26456/dist

Modified Files:
	VERSION 
Log Message:
Bump the VERSION up to 1.0.2 -- 1.0.1 was released to OSCAR's CVS


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/VERSION,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** VERSION	16 May 2002 05:02:12 -0000	1.2
--- VERSION	24 May 2002 05:16:55 -0000	1.3
***************
*** 1,5 ****
  major=1
  minor=0
! release=1
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=2
  alpha=0
  beta=0

[env-switcher-cvs] CVS: modules-oscar/dist modules-oscar.spec,1.5,1.6

From: Jeff S. <jsq...@us...> - 2002-05-24 03:53:05

Update of /cvsroot/env-switcher/modules-oscar/dist
In directory usw-pr-cvs1:/tmp/cvs-serv11716

Modified Files:
	modules-oscar.spec 
Log Message:
Bump up the release number to 7oscar.


Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** modules-oscar.spec	16 May 2002 05:02:39 -0000	1.5
--- modules-oscar.spec	24 May 2002 03:53:03 -0000	1.6
***************
*** 25,29 ****
  Name: modules
  Version: 3.1.6
! Release: 6oscar
  License: GPL
  Group: Applications/Environment
--- 25,29 ----
  Name: modules
  Version: 3.1.6
! Release: 7oscar
  License: GPL
  Group: Applications/Environment

[env-switcher-cvs] CVS: modules-oscar/src oscar.tcl,1.3,1.4

From: Jeff S. <jsq...@us...> - 2002-05-24 03:51:00

Update of /cvsroot/env-switcher/modules-oscar/src
In directory usw-pr-cvs1:/tmp/cvs-serv11266

Modified Files:
	oscar.tcl 
Log Message:
Thanks to Jeremiah W for help with the TCL.  Fix env-switcher bug
559951 where if there are multiple modules in
/opt/modules/oscar-modulefiles, load each module individually.  See
the comments in this file for an explanation.


Index: oscar.tcl
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/src/oscar.tcl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** oscar.tcl	16 May 2002 04:51:03 -0000	1.3
--- oscar.tcl	24 May 2002 03:50:57 -0000	1.4
***************
*** 30,37 ****
  setenv MANPATH :/opt/modules/default/man
  
! # Load all the modules in that tree
  
! set modules_to_load [exec ls $omdir]
! if { $modules_to_load != "" } {
!   module load $modules_to_load
  }
--- 30,42 ----
  setenv MANPATH :/opt/modules/default/man
  
! # Load all the modules in that tree.  We have to call "module" for
! # each one rather than building up a list of them and then running
! # "module load $all_the_modules" because we'd have to pipe that
! # through eval so that "$all_the_modules" expands into multiple argv
! # arguments.  But eval will expand meta characters, and potentially
! # run commands.  So instead, we run "module load" for each directory
! # in $omdir.
  
! foreach modulefile [glob $omdir/*] { 
!   module load [file tail $modulefile] 
  }

[env-switcher-cvs] CVS: env-switcher/src switcher.tcl.in,1.4,1.5

From: Jeff S. <jsq...@us...> - 2002-05-24 01:53:40

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv15984

Modified Files:
	switcher.tcl.in 
Log Message:
Change "$PATH" to "path" because if we put in $PATH, it causes Badness
and things like "module help switcher" and "module whatis switcher"
will fail.  I'm not sure what the exact problem is (don't know enough
about TCL...), but it probably has to do with trying to treat $PATH as
a TCL variable...?


Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** switcher.tcl.in	21 May 2002 02:38:37 -0000	1.4
--- switcher.tcl.in	24 May 2002 01:53:34 -0000	1.5
***************
*** 13,17 ****
    puts stderr "\tIt adds the following path to the modules \"use\" path:"
    puts stderr "\t\t@SWITCHER_DATADIR@"
!   puts stderr "\tIt also adds the following path to the $PATH:"
    puts stderr "\t\t@SWITCHER_BINDIR@"
  
--- 13,17 ----
    puts stderr "\tIt adds the following path to the modules \"use\" path:"
    puts stderr "\t\t@SWITCHER_DATADIR@"
!   puts stderr "\tIt also adds the following path to the path:"
    puts stderr "\t\t@SWITCHER_BINDIR@"

[env-switcher-cvs] CVS: env-switcher/dist VERSION,1.2,1.3

From: Jeff S. <jsq...@us...> - 2002-05-21 02:40:35

Update of /cvsroot/env-switcher/env-switcher/dist
In directory usw-pr-cvs1:/tmp/cvs-serv10900/dist

Modified Files:
	VERSION 
Log Message:
Update the version to 1.0.3


Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/VERSION,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** VERSION	18 May 2002 21:43:33 -0000	1.2
--- VERSION	21 May 2002 02:40:32 -0000	1.3
***************
*** 1,5 ****
  major=1
  minor=0
! release=2
  alpha=0
  beta=0
--- 1,5 ----
  major=1
  minor=0
! release=3
  alpha=0
  beta=0

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.6,1.7

From: Jeff S. <jsq...@us...> - 2002-05-21 02:39:39

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv10046

Modified Files:
	switcher.in 
Log Message:
Fix up the test for whether we should display the "can't find" message
or not.


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** switcher.in	19 May 2002 05:51:47 -0000	1.6
--- switcher.in	21 May 2002 02:39:36 -0000	1.7
***************
*** 939,943 ****
  	    if ($announce_load && -f "$tag_dir/$tag/$d") {
  		print "echo switcher:$tag: Loading $d;\n";
! 	    } elsif ($announce_warn) {
  		print "echo switcher:$tag: Cannot find modulefile for $d -- skipping;\n";
  	    }
--- 939,943 ----
  	    if ($announce_load && -f "$tag_dir/$tag/$d") {
  		print "echo switcher:$tag: Loading $d;\n";
! 	    } elsif ($announce_warn && ! -f "$tag_dir/$tag/$d") {
  		print "echo switcher:$tag: Cannot find modulefile for $d -- skipping;\n";
  	    }

[env-switcher-cvs] CVS: env-switcher/src switcher.tcl.in,1.3,1.4

From: Jeff S. <jsq...@us...> - 2002-05-21 02:38:40

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv9050

Modified Files:
	switcher.tcl.in 
Log Message:
Removed extraneous ";" -- the switcher script itself will output all
the nexessary ";" characters.


Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** switcher.tcl.in	18 May 2002 21:49:03 -0000	1.3
--- switcher.tcl.in	21 May 2002 02:38:37 -0000	1.4
***************
*** 42,46 ****
    set announce_output [exec switcher --announce]
    if { $announce_output != ""} {
!     puts "$announce_output;"
    }
  }
--- 42,46 ----
    set announce_output [exec switcher --announce]
    if { $announce_output != ""} {
!     puts "$announce_output"
    }
  }

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.5,1.6

From: Jeff S. <jsq...@us...> - 2002-05-19 05:51:50

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv24618

Modified Files:
	switcher.in 
Log Message:
Minor bug fixes


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** switcher.in	19 May 2002 00:22:30 -0000	1.5
--- switcher.in	19 May 2002 05:51:47 -0000	1.6
***************
*** 301,305 ****
      if (!$switcher_silent) {
  	if ($a =~ /all/i) {
! 	    $announce_error = $announce_warn = announce_load = 1;
  	} 
  	if ($a =~ /warn/i) {
--- 301,305 ----
      if (!$switcher_silent) {
  	if ($a =~ /all/i) {
! 	    $announce_error = $announce_warn = $announce_load = 1;
  	} 
  	if ($a =~ /warn/i) {
***************
*** 956,960 ****
  	if ($system_tags{$tag} != "1") {
  	    if ($announce_warn) {
! 		print "echo switcher: Tag \"$tag\" is in user defaults, but does not exist\n";
  	    }
  	}
--- 956,960 ----
  	if ($system_tags{$tag} != "1") {
  	    if ($announce_warn) {
! 		print "echo switcher: Tag \"$tag\" is in user defaults, but does not exist;\n";
  	    }
  	}

[env-switcher-cvs] CVS: env-switcher/man switcher.1,1.4,1.5

From: Jeff S. <jsq...@us...> - 2002-05-19 00:22:33

Update of /cvsroot/env-switcher/env-switcher/man
In directory usw-pr-cvs1:/tmp/cvs-serv21489/man

Modified Files:
	switcher.1 
Log Message:
- Removed diag() subroutine -- we don't need it
- Added "switcher <tag> = <name>" syntax
- Updated man page to match


Index: switcher.1
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/man/switcher.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** switcher.1	18 May 2002 23:44:05 -0000	1.4
--- switcher.1	19 May 2002 00:22:30 -0000	1.5
***************
*** 5,8 ****
--- 5,10 ----
  switcher --list
  .PP
+ switcher <tag> = <name> [<args>]
+ .PP
  switcher <tag> <command> [<args>]
  .SH DESCRIPTION
***************
*** 86,89 ****
--- 88,100 ----
  .I --list
  argument, all available tags are displayed.
+ .PP
+ When
+ .I switcher is invoked with the "<tag> = <name>" syntax, it is
+ actually an alias for the following:
+ .PP
+ switcher <tag> --add-attr default <name>
+ .PP
+ The "--system", "--user", "--force", and "--silent" arguments can be
+ also be used.
  .PP 
  When

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.4,1.5

From: Jeff S. <jsq...@us...> - 2002-05-19 00:22:33

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv21489/src

Modified Files:
	switcher.in 
Log Message:
- Removed diag() subroutine -- we don't need it
- Added "switcher <tag> = <name>" syntax
- Updated man page to match


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** switcher.in	18 May 2002 23:44:05 -0000	1.4
--- switcher.in	19 May 2002 00:22:30 -0000	1.5
***************
*** 901,906 ****
  
      my %attributes;
      my %sys_tags;
!     my $d, $a;
      
      # Iterate through all the tags in the system file.  Resolve each
--- 901,907 ----
  
      my %attributes;
+     my %user_vars;
      my %sys_tags;
!     my $d;
      
      # Iterate through all the tags in the system file.  Resolve each
***************
*** 947,951 ****
      # the system default so that we can print out warnings.
  
!     my %user_vars = $user_file->varlist(".*");
      foreach (keys(%user_vars)) {
  	($tag) = split(/_/, $_);
--- 948,952 ----
      # the system default so that we can print out warnings.
  
!     %user_vars = $user_file->varlist(".*");
      foreach (keys(%user_vars)) {
  	($tag) = split(/_/, $_);
***************
*** 993,1016 ****
  ############################################################################
  #
- # diag
- #
- # Do some comparisons between the user's $HOME/.switcher.ini and the
- # system switcher.ini and report on the following conditions:
- #
- # - If the user's $HOME/.switcher.ini has a tag that does not exist
- # - If the user's $HOME/.switcher.ini has a value for the "default"
- #   attribute that is a name that does not exist
- # - If the system switcher.ini has a tag that does not exist
- # - If the system switcher.ini has a value for the "default" attribute
- #   that is a name that does not exist
- #
- ############################################################################
- 
- sub diag {
-     0;
- }
- 
- ############################################################################
- #
  # write_ini_file
  #
--- 994,997 ----
***************
*** 1158,1164 ****
  	    show_exec();
  	    $action_done = 1;
- 	} elsif ($ARGV[0] eq "--diag") {
- 	    diag();
- 	    $action_done = 1;
  	} elsif ($ARGV[0] eq "--announce") {
  	    announce();
--- 1139,1142 ----
***************
*** 1214,1217 ****
--- 1192,1196 ----
      $clui_args->define("rm-tag!");
      $clui_args->define("add-name=s@");
+     $clui_args->define("\==s");
      $clui_args->define("rm-name=s");
      $clui_args->define("add-attr=s@");
***************
*** 1317,1320 ****
--- 1296,1308 ----
  	} 
  	
+ 	# "=" shortcut syntax
+ 
+ 	elsif ($ARGV[$i] eq "=") {
+ 	    $return_value = add_attr($clui_args->system(),
+ 				     "default", $ARGV[$i + 1],
+ 				     $clui_args->force());
+ 	    $action_done = 1;
+ 	}
+ 
  	# rm-attr

[env-switcher-cvs] CVS: env-switcher/man switcher.1,1.3,1.4

From: Jeff S. <jsq...@us...> - 2002-05-18 23:44:08

Update of /cvsroot/env-switcher/env-switcher/man
In directory usw-pr-cvs1:/tmp/cvs-serv1538/man

Modified Files:
	switcher.1 
Log Message:
- Enhanced announce attribute mechanism
- Updated man page to match new functionality


Index: switcher.1
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/man/switcher.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** switcher.1	18 May 2002 22:00:19 -0000	1.3
--- switcher.1	18 May 2002 23:44:05 -0000	1.4
***************
*** 188,199 ****
  .I switcher 
  expects is a value name on a given tag that indicates what modulefile
! should be loaded.
  .IP announce
! Valid values for the announce attribute are: true, false.  If true,
! switcher will print out a message announcing what name is loaded for a
! given tag.  If false (or undefined), no message will be printed.  If
! the global announce tag is set to true, all tag/name combinations will
! be printed as they are loaded, unless the announce attribute for a
! specific tag is set to false.
  .PP
  Attributes by any other name can be cached on a tag -- 
--- 188,204 ----
  .I switcher 
  expects is a value name on a given tag that indicates what modulefile
! should be loaded.  If the default attribute resolves to the 
! value "none", then no modulefile will be loaded for that tag.
  .IP announce
! The announce attribute takes a list of event types in which to display
! a message.  Valid event types are: all, none, load, warn, error.
! Other event types are ignored.  Multiple types should be delimited
! with commas.  The "load" type will print out a message indicating
! which name was loaded for the default attribute.  The "warn" type will
! print out warnings; the "error" type will print out errors.  "none"
! indicates that no messages should ever be printed; "all" is a shortcut
! for all types except "none".  If the announce attribute is undefined,
! it defaults to "warn,error", unless the "--silent" command line switch
! is used, in which case the announce attribute defaults to "none".
  .PP
  Attributes by any other name can be cached on a tag -- 
***************
*** 207,215 ****
  .I switcher
  attributes.
- .SH SPECIAL VALUES
- Currently, the only special value that
- .I switcher
- recognizes on the "default" attribute is "none".  This means that no
- modulefile will be loaded for that tag.
  .SH ATTRIBUTE SCOPE / RESOLUTION
  .I switcher
--- 212,215 ----

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.3,1.4

From: Jeff S. <jsq...@us...> - 2002-05-18 23:44:08

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv1538/src

Modified Files:
	switcher.in 
Log Message:
- Enhanced announce attribute mechanism
- Updated man page to match new functionality


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** switcher.in	18 May 2002 22:05:47 -0000	1.3
--- switcher.in	18 May 2002 23:44:05 -0000	1.4
***************
*** 278,281 ****
--- 278,320 ----
  ############################################################################
  #
+ # resolve_announce
+ #
+ # Figure out which kind of announcements we want.  Since this is a
+ # per-tag kind of decision, it's a subroutine.  Load up the global
+ # variables $announce_load, $announce_warn, $announce_error to each be
+ # either 0 or 1.
+ #
+ ############################################################################
+ 
+ sub resolve_announce {
+     my ($a) = @_;
+     $announce_load = 0;
+     $announce_warn = 0;
+     $announce_error = 0;
+ 
+     if ($a eq "") {
+ 	$a = "warn,error";
+     } elsif ($a =~ /all/i) {
+ 	$a = "warn,error,load";
+     }
+ 
+     if (!$switcher_silent) {
+ 	if ($a =~ /all/i) {
+ 	    $announce_error = $announce_warn = announce_load = 1;
+ 	} 
+ 	if ($a =~ /warn/i) {
+ 	    $announce_warn = 1;
+ 	}
+ 	if ($a =~ /error/i) {
+ 	    $announce_error = 1;
+ 	}
+ 	if ($a =~ /load/i) {
+ 	    $announce_load = 1;
+ 	}
+     }
+ }
+ 
+ ############################################################################
+ #
  # list_tags
  #
***************
*** 862,867 ****
  
      my %attributes;
      my $d, $a;
! 
      # Iterate through all the tags in the system file.  Resolve each
      # one.
--- 901,907 ----
  
      my %attributes;
+     my %sys_tags;
      my $d, $a;
!     
      # Iterate through all the tags in the system file.  Resolve each
      # one.
***************
*** 883,887 ****
  
  	$d = $attributes{$default_attribute};
! 	$a = $attributes{$announce_attribute};
  
  	# List the default tags
--- 923,927 ----
  
  	$d = $attributes{$default_attribute};
! 	resolve_announce($attributes{$announce_attribute});
  
  	# List the default tags
***************
*** 895,905 ****
  	# Print announcement notices
  
! 	if ($want_announce == 1 && 
! 	    ($a =~ /true/i || $a eq "1")) {
! 	    print "echo switcher:$tag: ";
! 	    if (-f "$tag_dir/$tag/$d") {
! 		print "Loading $d;\n";
! 	    } else {
! 		print "Cannot find modulefile for $d -- skipping;\n";
  	    }
  	}
--- 935,959 ----
  	# Print announcement notices
  
! 	if ($want_announce && $d ne "" && $d ne "none") {
! 	    if ($announce_load && -f "$tag_dir/$tag/$d") {
! 		print "echo switcher:$tag: Loading $d;\n";
! 	    } elsif ($announce_warn) {
! 		print "echo switcher:$tag: Cannot find modulefile for $d -- skipping;\n";
! 	    }
! 	}
!     }
! 
!     # Now go see if there's any tags in the user file that are not in
!     # the system default so that we can print out warnings.
! 
!     my %user_vars = $user_file->varlist(".*");
!     foreach (keys(%user_vars)) {
! 	($tag) = split(/_/, $_);
! 	%attributes = resolve_tag(0, 0);
! 	resolve_announce($attributes{$announce_attribute});
! 
! 	if ($system_tags{$tag} != "1") {
! 	    if ($announce_warn) {
! 		print "echo switcher: Tag \"$tag\" is in user defaults, but does not exist\n";
  	    }
  	}

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.2,1.3

From: Jeff S. <jsq...@us...> - 2002-05-18 22:05:59

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv15000

Modified Files:
	switcher.in 
Log Message:
Fix for env-switcher bug 556218 -- print a message reminding/telling
the user that attribute changes only take effect in *future* shells,
not the current environment.


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** switcher.in	18 May 2002 21:49:03 -0000	1.2
--- switcher.in	18 May 2002 22:05:47 -0000	1.3
***************
*** 734,738 ****
      $contents->set($attr_name, $value);
  
!     # Upon success, silence is golden
  
      0;
--- 734,744 ----
      $contents->set($attr_name, $value);
  
!     # Unless silent, remind the user that this will take effect for
!     # all new shells.
! 
!     if (!switcher_silent) {
! 	print "Attribute successfully set; new attribute setting will be " .
! 	    "effective for\nfuture shells\n";
!     }
  
      0;
***************
*** 891,899 ****
  	if ($want_announce == 1 && 
  	    ($a =~ /true/i || $a eq "1")) {
  	    if (-f "$tag_dir/$tag/$d") {
! 		print "echo switcher: Loading $tag:$d;\n";
  	    } else {
! 		print "echo switcher: Unable to find modulefile for $tag:$d " .
! 		    "-- skipping;\n";
  	    }
  	}
--- 897,905 ----
  	if ($want_announce == 1 && 
  	    ($a =~ /true/i || $a eq "1")) {
+ 	    print "echo switcher:$tag: ";
  	    if (-f "$tag_dir/$tag/$d") {
! 		print "Loading $d;\n";
  	    } else {
! 		print "Cannot find modulefile for $d -- skipping;\n";
  	    }
  	}

[env-switcher-cvs] CVS: env-switcher/man switcher.1,1.2,1.3

From: Jeff S. <jsq...@us...> - 2002-05-18 22:00:26

Update of /cvsroot/env-switcher/env-switcher/man
In directory usw-pr-cvs1:/tmp/cvs-serv11712/man

Modified Files:
	switcher.1 
Log Message:
Document the functionality of the announce tag, for bug 547637.


Index: switcher.1
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/man/switcher.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** switcher.1	16 May 2002 13:37:42 -0000	1.2
--- switcher.1	18 May 2002 22:00:19 -0000	1.3
***************
*** 184,193 ****
  .SH SPECIAL ATTRIBUTES
  Attribute names can contain any alpha/numeric combinations.
! Currently, the only attribute that
! .I switcher
! recognizes is "default".  The value that 
  .I switcher 
  expects is a value name on a given tag that indicates what modulefile
  should be loaded.
  .PP
  Attributes by any other name can be cached on a tag -- 
--- 184,199 ----
  .SH SPECIAL ATTRIBUTES
  Attribute names can contain any alpha/numeric combinations.
! .IP default
! The value for the default attribute that 
  .I switcher 
  expects is a value name on a given tag that indicates what modulefile
  should be loaded.
+ .IP announce
+ Valid values for the announce attribute are: true, false.  If true,
+ switcher will print out a message announcing what name is loaded for a
+ given tag.  If false (or undefined), no message will be printed.  If
+ the global announce tag is set to true, all tag/name combinations will
+ be printed as they are loaded, unless the announce attribute for a
+ specific tag is set to false.
  .PP
  Attributes by any other name can be cached on a tag --

[env-switcher-cvs] CVS: env-switcher/src switcher.in,1.1,1.2 switcher.tcl.in,1.2,1.3

From: Jeff S. <jsq...@us...> - 2002-05-18 21:49:06

Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv3721/src

Modified Files:
	switcher.in switcher.tcl.in 
Log Message:
- Eliminate $switcher_version -- not used anymore
- Added functionality for "announce" attribute for env-switcher bug #547637
- Do not print warnings if we can't find a modulefile for a name on a
  default attribute; this causes "module load switcher" to fail, and doesn't
  give any indication of why.  The "announce" functionality will give us
  that instead.
- Added diag() subroutine and --diag command line arg, but still 
  non-functional for the moment.  May be redundant after fully implementing
  --announce; we'll see


Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** switcher.in	23 Apr 2002 06:22:55 -0000	1.1
--- switcher.in	18 May 2002 21:49:03 -0000	1.2
***************
*** 12,16 ****
  #
  
- $switcher_version = "1.0";
  $prefix = "@prefix@";
  $system_filename = "@sysconfdir@/switcher.ini";
--- 12,15 ----
***************
*** 845,856 ****
  ############################################################################
  #
! # show_exec
  #
! # Take all the tags, resolve all the attributes, and come up with a
! # list of module commands to execute that will setup the environment.
  #
  ############################################################################
  
! sub show_exec {
      my %attributes;
      my $d, $a;
--- 844,858 ----
  ############################################################################
  #
! # examine_tags
  #
! # Look at all tags, resolve all the attributes, and either output the
! # list of module commands to execute that will setup the environment,
! # or display an announcement message for each.
  #
  ############################################################################
  
! sub examine_tags {
!     my ($want_default, $want_announce) = @_;
! 
      my %attributes;
      my $d, $a;
***************
*** 870,874 ****
  	# Select all the attributes for this tag and sort them
  	
! 	%attributes = resolve_tag($system, $user);
  	
  	# Extract the default and announce attributes
--- 872,876 ----
  	# Select all the attributes for this tag and sort them
  	
! 	%attributes = resolve_tag(0, 0);
  	
  	# Extract the default and announce attributes
***************
*** 877,887 ****
  	$a = $attributes{$announce_attribute};
  
! 	if ($d ne "" && $d ne "none") {
  	    if (-f "$tag_dir/$tag/$d") {
  		print "$tag/$d\n";
  	    } else {
! 		print_warning("Warning: unable to find modulefile for " .
! 			      "tag \"$tag\", name \"$d\"\n" .
! 			      "Warning: tag \"$tag\" will be skipped\n");
  	    }
  	}
--- 879,899 ----
  	$a = $attributes{$announce_attribute};
  
! 	# List the default tags
! 
! 	if ($want_default == 1 && $d ne "" && $d ne "none") {
  	    if (-f "$tag_dir/$tag/$d") {
  		print "$tag/$d\n";
+ 	    }
+ 	}
+ 
+ 	# Print announcement notices
+ 
+ 	if ($want_announce == 1 && 
+ 	    ($a =~ /true/i || $a eq "1")) {
+ 	    if (-f "$tag_dir/$tag/$d") {
+ 		print "echo switcher: Loading $tag:$d;\n";
  	    } else {
! 		print "echo switcher: Unable to find modulefile for $tag:$d " .
! 		    "-- skipping;\n";
  	    }
  	}
***************
*** 895,898 ****
--- 907,956 ----
  ############################################################################
  #
+ # show_exec
+ #
+ # Take all the tags, resolve all the attributes, and come up with a
+ # list of module commands to execute that will setup the environment.
+ #
+ ############################################################################
+ 
+ sub show_exec {
+     return examine_tags(1, 0);
+ }
+ 
+ ############################################################################
+ #
+ # announce
+ #
+ # Take all the tags, resolve all the attributes, and display an
+ # announcement message for each.
+ #
+ ############################################################################
+ 
+ sub announce {
+     return examine_tags(0, 1);
+ }
+ 
+ ############################################################################
+ #
+ # diag
+ #
+ # Do some comparisons between the user's $HOME/.switcher.ini and the
+ # system switcher.ini and report on the following conditions:
+ #
+ # - If the user's $HOME/.switcher.ini has a tag that does not exist
+ # - If the user's $HOME/.switcher.ini has a value for the "default"
+ #   attribute that is a name that does not exist
+ # - If the system switcher.ini has a tag that does not exist
+ # - If the system switcher.ini has a value for the "default" attribute
+ #   that is a name that does not exist
+ #
+ ############################################################################
+ 
+ sub diag {
+     0;
+ }
+ 
+ ############################################################################
+ #
  # write_ini_file
  #
***************
*** 1028,1034 ****
  }
  
! # The --list and --show-exec commands are special.  If no tag is
! # given, it's an implcit "--list".  If a tag is given with nothing
! # else, it's an implicit "<tag> --list".
  
  $tag = $ARGV[0];
--- 1086,1091 ----
  }
  
! # A few commands are special -- they don't taken an initial <tag>
! # argument.
  
  $tag = $ARGV[0];
***************
*** 1040,1043 ****
--- 1097,1106 ----
  	} elsif ($ARGV[0] eq "--show-exec") {
  	    show_exec();
+ 	    $action_done = 1;
+ 	} elsif ($ARGV[0] eq "--diag") {
+ 	    diag();
+ 	    $action_done = 1;
+ 	} elsif ($ARGV[0] eq "--announce") {
+ 	    announce();
  	    $action_done = 1;
  	} else {

Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** switcher.tcl.in	16 May 2002 14:01:14 -0000	1.2
--- switcher.tcl.in	18 May 2002 21:49:03 -0000	1.3
***************
*** 35,38 ****
--- 35,49 ----
  module use @SWITCHER_DATADIR@
  
+ # If we're not removing the module, call switcher to announce what
+ # modules we're loading (per user/system settings, of course)
+ 
+ set is_module_rm  [module-info mode remove]
+ if { ! $is_module_rm } {
+   set announce_output [exec switcher --announce]
+   if { $announce_output != ""} {
+     puts "$announce_output;"
+   }
+ }
+ 
  # Now invoke the switcher perl script to get a list of the modules
  # that need to be loaded.  If we get a non-empty string back, load

Flat | Threaded

<< < 1 .. 3 4 5 6 > >> (Page 5 of 6)

2002	Jan	Feb	Mar	Apr (5)	May (37)	Jun (2)	Jul (7)	Aug (12)	Sep (6)	Oct (32)	Nov	Dec
2003	Jan	Feb (1)	Mar	Apr	May	Jun	Jul (8)	Aug	Sep	Oct	Nov	Dec
2004	Jan (11)	Feb	Mar (15)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2005	Jan	Feb (6)	Mar (2)	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec