Menu
▾
▴
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
|
|
From: Jeff S. <jsq...@us...> - 2004-01-16 16:13:19
|
Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv5169
Modified Files:
env-switcher.spec.in
Log Message:
Disable automatic dependency generation because RH8/RH9 seems to pick
up perl(AppConfig), which I can't seem to resolve anywhere. :-(
Index: env-switcher.spec.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/env-switcher.spec.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** env-switcher.spec.in 16 Jan 2004 15:54:07 -0000 1.13
--- env-switcher.spec.in 16 Jan 2004 16:13:16 -0000 1.14
***************
*** 30,33 ****
--- 30,39 ----
%define _modulefilesdir @MODULEFILESDIR@
+ # Defining these to nothing overrides the stupid automatic RH9
+ # functionality of making "debuginfo" RPMs.
+
+ %define debug_package %{nil}
+ %define __check_files %{nil}
+
#############################################################################
***************
*** 50,53 ****
--- 56,60 ----
Requires: modules-oscar tcl perl-AppConfig
Provides: switcher
+ AutoReqProv: no
%description
|
|
From: Jeff S. <jsq...@us...> - 2004-01-16 15:54:31
|
Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv32686
Modified Files:
buildrpm.sh
Log Message:
Updates to make the script mo' better
Index: buildrpm.sh
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/buildrpm.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** buildrpm.sh 11 Oct 2002 17:00:44 -0000 1.4
--- buildrpm.sh 16 Jan 2004 15:54:27 -0000 1.5
***************
*** 73,79 ****
#
! if test -d /usr/src/RPM; then
rpmtopdir="/usr/src/RPM"
else
rpmtopdir="/usr/src/redhat"
fi
--- 73,97 ----
#
! rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"
! if test "$rpmtopdir" != ""; then
! if test ! -d "$rpmtopdir"; then
! mkdir -p "$rpmtopdir"
! mkdir -p "$rpmtopdir/BUILD"
! mkdir -p "$rpmtopdir/RPMS"
! mkdir -p "$rpmtopdir/RPMS/i386"
! mkdir -p "$rpmtopdir/RPMS/i586"
! mkdir -p "$rpmtopdir/RPMS/i686"
! mkdir -p "$rpmtopdir/RPMS/noarch"
! mkdir -p "$rpmtopdir/RPMS/athlon"
! mkdir -p "$rpmtopdir/SOURCES"
! mkdir -p "$rpmtopdir/SPECS"
! mkdir -p "$rpmtopdir/SRPMS"
! fi
! need_root=0
! elif test -d /usr/src/RPM; then
! need_root=1
rpmtopdir="/usr/src/RPM"
else
+ need_root=1
rpmtopdir="/usr/src/redhat"
fi
***************
*** 84,88 ****
#
! if test "`whoami`" != "root"; then
echo "--> Trying to sudo: \"$0 $*\""
echo "------------------------------------------------------------"
--- 102,148 ----
#
! if test "$need_root" = "1" -a "`whoami`" != "root"; then
! echo "--> Trying to sudo: \"$0 $*\""
! echo "------------------------------------------------------------"
! sudo -u root sh -c "$0 $tarball"
! echo "------------------------------------------------------------"
! echo "--> sudo finished"
! exit 0
! fi
!
! #
! # Find where the top RPM-building directory is
! #
!
! rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"
! if test "$rpmtopdir" != ""; then
! if test ! -d "$rpmtopdir"; then
! mkdir -p "$rpmtopdir"
! mkdir -p "$rpmtopdir/BUILD"
! mkdir -p "$rpmtopdir/RPMS"
! mkdir -p "$rpmtopdir/RPMS/i386"
! mkdir -p "$rpmtopdir/RPMS/i586"
! mkdir -p "$rpmtopdir/RPMS/i686"
! mkdir -p "$rpmtopdir/RPMS/noarch"
! mkdir -p "$rpmtopdir/RPMS/athlon"
! mkdir -p "$rpmtopdir/SOURCES"
! mkdir -p "$rpmtopdir/SPECS"
! mkdir -p "$rpmtopdir/SRPMS"
! fi
! need_root=0
! elif test -d /usr/src/RPM; then
! need_root=1
! rpmtopdir="/usr/src/RPM"
! else
! need_root=1
! rpmtopdir="/usr/src/redhat"
! fi
! echo "--> Found RPM top dir: $rpmtopdir"
!
! #
! # If we're not root, try to sudo
! #
!
! if test "$need_root" = "1" -a "`whoami`" != "root"; then
echo "--> Trying to sudo: \"$0 $*\""
echo "------------------------------------------------------------"
***************
*** 158,179 ****
echo "--> Building the OSCAR RPM"
! cmd="rpm -ba --target=$oscar_target $specdest"
echo "--> $cmd"
eval $cmd
- # This is a total hack and is only here because RPM changed option
- # formats between RH 7.1 and 7.2. <sigh>
-
- if test $? != 0; then
- echo "--> TRY AGAIN: without the =..."
- new_cmd="`echo $cmd | sed -e 's/=/ /'`"
- echo "--> $new_cmd"
- eval $new_cmd
- fi
- if test $? != 0; then
- echo "*** FAILURE BUILDING OSCAR RPM!"
- echo "Aborting"
- exit 1
- fi
echo "--> Done building the OSCAR RPM"
--- 218,225 ----
echo "--> Building the OSCAR RPM"
! cmd="rpmbuild -ba --target=$oscar_target $specdest"
echo "--> $cmd"
eval $cmd
echo "--> Done building the OSCAR RPM"
|
|
From: Jeff S. <jsq...@us...> - 2004-01-16 15:54:12
|
Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv32611
Modified Files:
env-switcher.spec.in
Log Message:
Make default for OSCAR to --enable-suppress-errors
Index: env-switcher.spec.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/env-switcher.spec.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** env-switcher.spec.in 29 Oct 2002 16:21:37 -0000 1.12
--- env-switcher.spec.in 16 Jan 2004 15:54:07 -0000 1.13
***************
*** 1,6 ****
# -*- rpm-spec -*-
#
! # Copyright (c) 2002 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the Env-switcher software package. For license
--- 1,6 ----
# -*- rpm-spec -*-
#
! # Copyright (c) 2002-2004 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the Env-switcher software package. For license
***************
*** 90,94 ****
#############################################################################
%build
! %configure --with-modulefiles=%{_modulefilesdir}
make all
--- 90,94 ----
#############################################################################
%build
! %configure --with-modulefiles=%{_modulefilesdir} --enable-suppress-errors
make all
|
|
From: Jeff S. <jsq...@us...> - 2004-01-16 15:38:01
|
Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29249/src
Modified Files:
switcher.in
Log Message:
Update the help message; make it clean that --system and --user have to be
the last command line args.
Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** switcher.in 16 Jan 2004 15:08:25 -0000 1.15
--- switcher.in 16 Jan 2004 15:37:58 -0000 1.16
***************
*** 170,187 ****
--silent Do not print any status/warning messages
! Set a tag equal to a name
! \$ switcher <tag> = <name>
! List all available tags
! \$ switcher --list
! List all available names for <tag>
! \$ switcher <tag> --list
!
!
Resolve and show all atrributes for <tag> for system scope, user
scope, or effective scope
\$ switcher <tag> --show [--system|--user]
Add the tag <tag>
--- 170,186 ----
--silent Do not print any status/warning messages
! Set a tag equal to a name
! \$ switcher <tag> = <name>
! List all available tags
! \$ switcher --list
! List all available names for <tag>
! \$ switcher <tag> --list
Resolve and show all atrributes for <tag> for system scope, user
scope, or effective scope
\$ switcher <tag> --show [--system|--user]
+ (--system or --user must be the last argument)
Add the tag <tag>
***************
*** 201,208 ****
--- 200,209 ----
system or user scope (--user is implied)
\$ switcher <tag> --add-attr <attribute> <value> [--system|--user]
+ (--system or --user must be the last argument)
Remove <attribute> from <tag> in the system or user scope (--user is
implied)
\$ switcher <tag> --rm-attr <attribute> [--system|--user]
+ (--system or --user must be the last argument)
";
}
|
|
From: Jeff S. <jsq...@us...> - 2004-01-16 15:37:32
|
Update of /cvsroot/env-switcher/env-switcher/man In directory sc8-pr-cvs1:/tmp/cvs-serv29178/man Modified Files: switcher.1 Log Message: Update to the man page about limitations of the command line parsing scheme Index: switcher.1 =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/man/switcher.1,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** switcher.1 13 Feb 2003 22:48:28 -0000 1.8 --- switcher.1 16 Jan 2004 15:37:29 -0000 1.9 *************** *** 137,141 **** .PP The "--system", "--user", "--force", and "--silent" arguments can be ! also be used. .PP When --- 137,143 ---- .PP The "--system", "--user", "--force", and "--silent" arguments can be ! also be used. Note that "--system", "--user", etc., must be the last ! arguments on the command line, due to limitations of switcher's ! command line parsing scheme. See the BUGS section, below. .PP When *************** *** 156,162 **** or .I user ! indicating which level the attribute is actually set at, "name" ! will be the name of the attribute shown, and "value" will be the value ! of the attribute. .IP --add-tag Add the tag to the --- 158,166 ---- or .I user ! indicating which level the attribute is actually set at, "name" will ! be the name of the attribute shown, and "value" will be the value of ! the attribute. Note that the "--system" or "--user" switch must be ! the last argument on the command line, due to limitations of ! switcher's command line parsing scheme. See the BUGS section, below. .IP --add-tag Add the tag to the *************** *** 202,206 **** .I --user is specified or no scoping argument is given, the attribute and value ! are written to the user-level default file for the current user. .IP "--rm-attr <attribute> [--system|--user]" Remove the attribute --- 206,213 ---- .I --user is specified or no scoping argument is given, the attribute and value ! are written to the user-level default file for the current user. Note ! that the "--system" or "--user" switch must be the last argument on ! the command line, due to limitations of switcher's command line ! parsing scheme. See the BUGS section, below. .IP "--rm-attr <attribute> [--system|--user]" Remove the attribute *************** *** 213,217 **** .I --user is specified or no scoping argument is given, the attribute is removed ! from the user-level default file for the current user. .SH NOMENCLATURE .I switcher --- 220,227 ---- .I --user is specified or no scoping argument is given, the attribute is removed ! from the user-level default file for the current user. Note that ! the "--system" or "--user" switch must be the last argument on the command ! line, due to limitations of switcher's command line parsing scheme. ! See the BUGS section, below. .SH NOMENCLATURE .I switcher *************** *** 376,379 **** --- 386,399 ---- is effectively disabled for all users who do not specifically use .IR switcher . + .SH BUGS + Due to limitations in switcher's command line parsing scheme, the + ordering or arguments listed in this man page and in the help messages + must be preserved. For example, "--user" and "--system" must be the + last arguments on the command line. + .PP + This is certainly fixable, but it would probably require an overhaul + the parsing system, and probably ditching the Perl AppConfig module + that is currently used for parsing (due to limitations of AppConfig). + I just don't have the time to do that right now. :-) .SH FILES The defaults are maintained in ini-style text files. These files can |
|
From: Jeff S. <jsq...@us...> - 2004-01-16 15:08:28
|
Update of /cvsroot/env-switcher/env-switcher
In directory sc8-pr-cvs1:/tmp/cvs-serv22316
Modified Files:
configure.in
Log Message:
Minor fixes.
Index: configure.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** configure.in 15 Jan 2004 17:04:44 -0000 1.4
--- configure.in 16 Jan 2004 15:08:25 -0000 1.5
***************
*** 99,103 ****
AC_HELP_STRING([--enable-suppress-errors],
[Set switcher to default to not show any errors]))
! if test "$enable_suppress_errors" != "no"; then
AC_MSG_RESULT([yes])
WANT_SILENT=1
--- 99,103 ----
AC_HELP_STRING([--enable-suppress-errors],
[Set switcher to default to not show any errors]))
! if test "$enable_suppress_errors" = "yes"; then
AC_MSG_RESULT([yes])
WANT_SILENT=1
***************
*** 108,111 ****
--- 108,112 ----
DEFAULT_ANNOUNCE_VALUE="warn,error"
fi
+ AC_SUBST(DEFAULT_ANNOUNCE_VALUE)
#
|
|
From: Jeff S. <jsq...@us...> - 2004-01-16 15:08:28
|
Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22316/src
Modified Files:
switcher.in
Log Message:
Minor fixes.
Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** switcher.in 15 Jan 2004 17:08:40 -0000 1.14
--- switcher.in 16 Jan 2004 15:08:25 -0000 1.15
***************
*** 60,63 ****
--- 60,64 ----
my $system_file_modified = 0;
my $switcher_silent = 0;
+ my $want_help = 0;
my $switcher_help = 0;
my $switcher_more_help = 0;
***************
*** 150,154 ****
\$ switcher <tag> --list # List all available <name> values for <tag>
! For more help, type \"switcher --more-help
";
}
--- 151,155 ----
\$ switcher <tag> --list # List all available <name> values for <tag>
! For more help, type \"switcher --more-help\"
";
}
***************
*** 1352,1356 ****
$switcher_silent = $clui_args->silent();
$switcher_help = $clui_args->help();
! $switcher_more_help = $clui_args->more_help();
if ($switcher_help || $switcher_more_help) {
$want_help = 1;
--- 1353,1357 ----
$switcher_silent = $clui_args->silent();
$switcher_help = $clui_args->help();
! $switcher_more_help = $clui_args->get("more-help");
if ($switcher_help || $switcher_more_help) {
$want_help = 1;
|
|
From: Jeff S. <jsq...@us...> - 2004-01-15 17:08:49
|
Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27407/src
Modified Files:
switcher.in
Log Message:
- Have two different help messages (normal and "more help")
- Document the "=" operator (was conspicuously absent from the help message)
- Get the default value for the "announce" attribute from configure
Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** switcher.in 29 Oct 2002 16:21:20 -0000 1.13
--- switcher.in 15 Jan 2004 17:08:40 -0000 1.14
***************
*** 1,6 ****
#!/usr/bin/perl -- -*- perl -*-
#
! # Copyright (c) 2002 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the Env-switcher software package. For license
--- 1,6 ----
#!/usr/bin/perl -- -*- perl -*-
#
! # Copyright (c) 2002-2004 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the Env-switcher software package. For license
***************
*** 30,33 ****
--- 30,35 ----
my $deleted_value = " _-=DELETED=-_ ";
+ my $default_announce_value = "@DEFAULT_ANNOUNCE_VALUE@";
+
# Create new AppConfig objects for the system and user files
***************
*** 54,62 ****
my $action_done = 0;
- my $want_help = 0;
my $return_value = 0;
my $user_file_modified = 0;
my $system_file_modified = 0;
my $switcher_silent = 0;
my $announce_load = 0;
my $announce_warn = 0;
--- 56,65 ----
my $action_done = 0;
my $return_value = 0;
my $user_file_modified = 0;
my $system_file_modified = 0;
my $switcher_silent = 0;
+ my $switcher_help = 0;
+ my $switcher_more_help = 0;
my $announce_load = 0;
my $announce_warn = 0;
***************
*** 134,143 ****
--force Do the action without prompting for confirmation
--silent Do not print any status/warning messages
! List all available tags
! \$ switcher --list
! List all available names for <tag>
! \$ switcher <tag> --list
Resolve and show all atrributes for <tag> for system scope, user
--- 137,182 ----
--force Do the action without prompting for confirmation
--silent Do not print any status/warning messages
+ (equivalent to setting \"announce\" tag to \"error\")
+
+ Most commonly used option:
+ \$ switcher <tag> = <name>
+
+ For example:
+ \$ switcher mpi = lam-7.0.2
+
+ To list all available <tag> and <name> values, use:
+
+ \$ switcher --list # List all available <tag> values
+ \$ switcher <tag> --list # List all available <name> values for <tag>
+
+ For more help, type \"switcher --more-help
+ ";
+ }
! ############################################################################
! #
! # display_more_help
! #
! # Show the more detailed help message.
! #
! ############################################################################
! sub display_more_help {
! print "switcher syntax:
!
! General options (applied to most major commands)
! --force Do the action without prompting for confirmation
! --silent Do not print any status/warning messages
!
! Set a tag equal to a name
! \$ switcher <tag> = <name>
!
! List all available tags
! \$ switcher --list
!
! List all available names for <tag>
! \$ switcher <tag> --list
!
!
Resolve and show all atrributes for <tag> for system scope, user
***************
*** 391,395 ****
if (!$a) {
! $a = "warn,error";
} elsif ($a =~ /all/i) {
$a = "warn,error,load";
--- 430,435 ----
if (!$a) {
! # $a = "warn,error";
! $a = $default_announce_value;
} elsif ($a =~ /all/i) {
$a = "warn,error,load";
***************
*** 1286,1289 ****
--- 1326,1332 ----
$clui_args->define("show!");
+ $clui_args->define("help!");
+ $clui_args->define("more-help!");
+
# Do the parsing. Since the parse routine will stop when it hits
# the first arg that doesn't begin with "-", we may have to parse
***************
*** 1308,1311 ****
--- 1351,1359 ----
$switcher_silent = $clui_args->silent();
+ $switcher_help = $clui_args->help();
+ $switcher_more_help = $clui_args->more_help();
+ if ($switcher_help || $switcher_more_help) {
+ $want_help = 1;
+ }
my $i = 0;
***************
*** 1337,1343 ****
elsif ($ARGV[$i] eq "add-name") {
if ($i + 2 > $#ARGV) {
! print_error("Error: must specify <name> and <dir> " .
! "arguments with --add-name\n");
! $want_help = 1;
} elsif (! -d $ARGV[$i + 2]) {
print_error("Error: <dir> argument must be a valid, " .
--- 1385,1393 ----
elsif ($ARGV[$i] eq "add-name") {
if ($i + 2 > $#ARGV) {
! if (!$switcher_silent) {
! print_error("Error: must specify <name> and <dir> " .
! "arguments with --add-name\n");
! $want_help = 1;
! }
} elsif (! -d $ARGV[$i + 2]) {
print_error("Error: <dir> argument must be a valid, " .
***************
*** 1449,1453 ****
elsif ($want_help) {
! display_help();
}
--- 1499,1507 ----
elsif ($want_help) {
! if ($switcher_more_help) {
! display_more_help();
! } else {
! display_help();
! }
}
|
|
From: Jeff S. <jsq...@us...> - 2004-01-15 17:04:51
|
Update of /cvsroot/env-switcher/env-switcher In directory sc8-pr-cvs1:/tmp/cvs-serv26621 Modified Files: configure.in Log Message: Add --enable-suppress-errors configure switch. Grumble. Index: configure.in =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** configure.in 11 Oct 2002 17:00:43 -0000 1.3 --- configure.in 15 Jan 2004 17:04:44 -0000 1.4 *************** *** 1,6 **** # -*- shell-script -*- # ! # Copyright (c) 2002 The Trustees of Indiana University. ! # All rights reserved. # # This file is part of the Env-switcher software package. For license --- 1,6 ---- # -*- shell-script -*- # ! # Copyright (c) 2002-2004 The Trustees of Indiana University. ! # All rights reserved. # # This file is part of the Env-switcher software package. For license *************** *** 92,100 **** # # Figure out where modulefiles get installed # AC_MSG_CHECKING([where modulefiles get installed]) ! AC_ARG_WITH(modulefiles, [ --with-modulefiles=DIR directory where modulefiles get installed]) MODULEFILESDIR= --- 92,120 ---- # + # Do we want silent output by default? + # + + AC_MSG_CHECKING([if suppress errors by default]) + AC_ARG_ENABLE(suppress-errors, + AC_HELP_STRING([--enable-suppress-errors], + [Set switcher to default to not show any errors])) + if test "$enable_suppress_errors" != "no"; then + AC_MSG_RESULT([yes]) + WANT_SILENT=1 + DEFAULT_ANNOUNCE_VALUE="none" + else + AC_MSG_RESULT([no]) + WANT_SILENT=0 + DEFAULT_ANNOUNCE_VALUE="warn,error" + fi + + # # Figure out where modulefiles get installed # AC_MSG_CHECKING([where modulefiles get installed]) ! AC_ARG_WITH(modulefiles, ! AC_HELP_STRING([--with-modulefiles=DIR], ! [directory where modulefiles get installed])) MODULEFILESDIR= |
|
From: Jeff S. <jsq...@us...> - 2004-01-15 17:04:16
|
Update of /cvsroot/env-switcher/env-switcher/src In directory sc8-pr-cvs1:/tmp/cvs-serv26572/src Modified Files: switcher.tcl.in Log Message: Update copyright Index: switcher.tcl.in =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** switcher.tcl.in 19 Jul 2003 18:11:33 -0000 1.10 --- switcher.tcl.in 15 Jan 2004 17:04:13 -0000 1.11 *************** *** 1,5 **** #%Module -*- tcl -*- # ! # Copyright (c) 2002-2003 The Trustees of Indiana University. # All rights reserved. # --- 1,5 ---- #%Module -*- tcl -*- # ! # Copyright (c) 2002-2004 The Trustees of Indiana University. # All rights reserved. # |
|
From: Jeff S. <jsq...@us...> - 2004-01-15 16:38:35
|
Update of /cvsroot/env-switcher/env-switcher
In directory sc8-pr-cvs1:/tmp/cvs-serv19772
Modified Files:
LICENSE INSTALL README
Log Message:
Update docs
Index: LICENSE
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/LICENSE,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** LICENSE 19 Jul 2003 18:11:33 -0000 1.4
--- LICENSE 15 Jan 2004 16:38:32 -0000 1.5
***************
*** 1,5 ****
Software License for Env-switcher
! Copyright (c) 2002-2003 The Trustees of Indiana University.
All rights reserved.
--- 1,5 ----
Software License for Env-switcher
! Copyright (c) 2002-2004 The Trustees of Indiana University.
All rights reserved.
Index: INSTALL
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** INSTALL 19 Jul 2003 18:11:33 -0000 1.3
--- INSTALL 15 Jan 2004 16:38:32 -0000 1.4
***************
*** 1,5 ****
-*- text -*-
! Copyright (c) 2002-2003 The Trustees of Indiana University.
All rights reserved.
--- 1,5 ----
-*- text -*-
! Copyright (c) 2002-2004 The Trustees of Indiana University.
All rights reserved.
***************
*** 19,31 ****
However, if someone has a burning desire to compile from source,
! configure takes two important options:
1. --prefix=DIR: the directory where switcher will be installed
2. --with-modulefiles=DIR: the directory base where the switcher
module itself should be installed
A standard "make all install" will do the deed.
Usage
=====
--- 19,81 ----
However, if someone has a burning desire to compile from source,
! configure takes three important options:
1. --prefix=DIR: the directory where switcher will be installed
2. --with-modulefiles=DIR: the directory base where the switcher
module itself should be installed
+ 3. --enable-suppress-errors: since env-switcher is involved in the
+ startup of *EVERY SHELL SESSION* on your machine, it is *CRITICAL*
+ to understand what this option does before proceedings. See
+ "Shell Startup Errors", below.
A standard "make all install" will do the deed.
+ Shell Startup Errors
+ ====================
+
+ There is a strong religious debate in the system administrator
+ community about how to handle errors at shell startup.
+
+ - One camp says that outputting messages to stderr is acceptable, even
+ though this makes some utilities fail (e.g., scp, sftp, cpush,
+ etc.). The rationale multi-fold:
+
+ 1. You always want to know when there is a problem with shell
+ startup. Otherwise, some executables (for example) may
+ mysteriously disappear from user's paths, and there is no
+ explanation as to why they are gone.
+ 2. Even though *some* utilities fail, others do not. It is always
+ possible to fix the shell startup error without much effort.
+ 3. Other utilities write errors to stderr upon failure, even during
+ shell startup (e.g., xauth, ssh itself, etc.).
+
+ - The other camp says that you should *never* output anything to
+ stderr. Errors should be handled or discarded silently. Users have
+ to fend for themselves and try to figure out why certain
+ executables, libraries, or man pages have seemingly disappeared,
+ even though they have specific defaults to make them appear.
+
+ The main rationale is that outputting to stderr causes some
+ utilities to fail (in some cases, unavoidably -- for example,
+ there's really no good way for scp to *not* fail if something is
+ written to stderr).
+
+ I firmly fall in the former camp (if something is wrong, you should be
+ notified, even if it causes other things to fail). Indeed, I added
+ capabilities to env-switcher a long, long time ago to make switcher
+ not display errors -- it simply required running a single switcher
+ command. But some lazy system administrators need the default set for
+ them during configuration.
+
+ The end result is that it really doesn't matter that much.
+ Env-switcher now has a configure switch "--enable-suppress-errors"
+ that will set switcher's default behavior in the presence of errors.
+
+ The name is meant to emphasize the magnitude of what you are doing:
+ you are supressing env-switcher from showing legitimate errors. You
+ have been warned. :-)
+
+
Usage
=====
Index: README
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** README 19 Jul 2003 18:11:33 -0000 1.4
--- README 15 Jan 2004 16:38:32 -0000 1.5
***************
*** 1,5 ****
-*- text -*-
! Copyright (c) 2002-2003 The Trustees of Indiana University.
All rights reserved.
--- 1,5 ----
-*- text -*-
! Copyright (c) 2002-2004 The Trustees of Indiana University.
All rights reserved.
***************
*** 135,139 ****
Let's go through those 7 steps again, and show the exact switcher
commands that are used. Remember that all the string names used below
! (e.g., "mpi", "lam-6.5.6", "mpich-1.2.1" are arbitrary and have no
special meaning to switcher):
--- 135,139 ----
Let's go through those 7 steps again, and show the exact switcher
commands that are used. Remember that all the string names used below
! (e.g., "mpi", "lam-7.0.2", "mpich-1.2.1" are arbitrary and have no
special meaning to switcher):
***************
*** 141,149 ****
section:
! switcher mpi --add-name lam-6.5.6 /opt/lam-6.5.6/etc
! This copies a modulefile named "lam-6.5.6" from /opt/lam-6.5.6/etc
into the switcher central repository, and makes the name
! "lam-6.5.6" available under the "mpi" tag group.
2. The MPICH OSCAR RPM is installed:
--- 141,149 ----
section:
! switcher mpi --add-name lam-7.0.2 /opt/lam-7.0.2/etc
! This copies a modulefile named "lam-7.0.2" from /opt/lam-7.0.2/etc
into the switcher central repository, and makes the name
! "lam-7.0.2" available under the "mpi" tag group.
2. The MPICH OSCAR RPM is installed:
***************
*** 153,161 ****
3. The OSCAR sysadmin picks LAM/MPI to be the default:
! switcher mpi --add-attr default lam-6.5.6 --system
! Now all users will magically invoke the lam-6.5.6 modulefile upon
shell initialization, and have their $PATH and $MANPATH set for
! LAM/MPI 6.5.6.
4. Joe User wants to see what other MPI implementations are available:
--- 153,161 ----
3. The OSCAR sysadmin picks LAM/MPI to be the default:
! switcher mpi --add-attr default lam-7.0.2 --system
! Now all users will magically invoke the lam-7.0.2 modulefile upon
shell initialization, and have their $PATH and $MANPATH set for
! LAM/MPI 7.0.2.
4. Joe User wants to see what other MPI implementations are available:
***************
*** 209,221 ****
Several query options can be used to show
! % switcher --list
List all defined tags.
! % switcher <tag> --list
List all defined names for a given <tag>.
! % switcher <tag> --show [--system|--user]
Shows the current attributes and corresponding values for a given
--- 209,234 ----
Several query options can be used to show
! shell$ switcher <tag> = <name>
!
! This is probably the most common usage of switcher; users will set
! their default <name> for a given <tag>. A common example:
!
! switcher mpi = lam-7.0.2
!
! This sets the value of the "mpi" <tag> to be the <name> "lam-7.0.2".
! Of course, the possible values for <tag> and <name> are finite --
! you can only use the <tag>s and associated <names>s that are
! installed on your system. The options listed below provide the
! valid list of <tag>s and <name>s on your system.
!
! shell$ switcher --list
List all defined tags.
! shell$ switcher <tag> --list
List all defined names for a given <tag>.
! shell$ switcher <tag> --show [--system|--user]
Shows the current attributes and corresponding values for a given
***************
*** 236,240 ****
Administrators maintain "tags", "names", and "attributes".
! % switcher <tag> --add-tag [--force]
Create a new tag named <tag>. If <tag> already exists, prompt to
--- 249,253 ----
Administrators maintain "tags", "names", and "attributes".
! shell# switcher <tag> --add-tag [--force]
Create a new tag named <tag>. If <tag> already exists, prompt to
***************
*** 242,251 ****
silently.
! % switcher <tag> --rm-tag [--force]
Remove the tag <tag> (and all of its corresponding names) if it
exists. Prompt for confirmation unless --force is given.
! % switcher <tag> --add-name <name> <dir> [--force]
Creates a name for the specified <tag>, and copies a modulefile from
--- 255,264 ----
silently.
! shell# switcher <tag> --rm-tag [--force]
Remove the tag <tag> (and all of its corresponding names) if it
exists. Prompt for confirmation unless --force is given.
! shell# switcher <tag> --add-name <name> <dir> [--force]
Creates a name for the specified <tag>, and copies a modulefile from
***************
*** 262,266 ****
before processing creating the <name>.
! % switcher <tag> --rm-name <name> [--force]
Removes a <tag>/<name> combination from the switcher central
--- 275,279 ----
before processing creating the <name>.
! shell# switcher <tag> --rm-name <name> [--force]
Removes a <tag>/<name> combination from the switcher central
***************
*** 275,279 ****
system-default attributes.
! % switcher <tag> --add-attr <attribute> <value> [--system|--user] [--force]
Sets the <value> for a given <attribute> under the specified <tag>.
--- 288,292 ----
system-default attributes.
! shell$ switcher <tag> --add-attr <attribute> <value> [--system|--user] [--force]
Sets the <value> for a given <attribute> under the specified <tag>.
***************
*** 286,290 ****
the same if --system is not supplied).
! % switcher <tag> --rm-attr <attribute> [--system|--user] [--force]
Delete the <attribute> from the specified <tag>. Prompt for
--- 299,303 ----
the same if --system is not supplied).
! shell$ switcher <tag> --rm-attr <attribute> [--system|--user] [--force]
Delete the <attribute> from the specified <tag>. Prompt for
|
|
From: Jeff S. <jsq...@us...> - 2003-07-21 13:16:02
|
Update of /cvsroot/env-switcher/modules-oscar/dist In directory sc8-pr-cvs1:/tmp/cvs-serv9973 Modified Files: modules-oscar.spec Log Message: update the release number Index: modules-oscar.spec =================================================================== RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** modules-oscar.spec 21 Jul 2003 13:02:01 -0000 1.16 --- modules-oscar.spec 21 Jul 2003 13:15:59 -0000 1.17 *************** *** 34,38 **** Name: modules-oscar Version: 3.1.6 ! Release: 3 License: GPL Group: Applications/Environment --- 34,38 ---- Name: modules-oscar Version: 3.1.6 ! Release: 4 License: GPL Group: Applications/Environment |
|
From: Jeff S. <jsq...@us...> - 2003-07-21 13:02:04
|
Update of /cvsroot/env-switcher/modules-oscar/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv7978/dist
Modified Files:
buildrpm.sh modules-oscar.spec
Log Message:
Updates to make the RPM more robust
Index: buildrpm.sh
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/buildrpm.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** buildrpm.sh 27 Oct 2002 12:24:07 -0000 1.5
--- buildrpm.sh 21 Jul 2003 13:02:00 -0000 1.6
***************
*** 85,90 ****
if test -d /usr/src/RPM; then
rpmtopdir="/usr/src/RPM"
! else
rpmtopdir="/usr/src/redhat"
fi
echo "--> Found RPM top dir: $rpmtopdir"
--- 85,96 ----
if test -d /usr/src/RPM; then
rpmtopdir="/usr/src/RPM"
! elif test -d /usr/src/redhat; then
rpmtopdir="/usr/src/redhat"
+ elif test -d /usr/src/packages; then
+ rpmtopdir="/usr/src/packages"
+ else
+ echo "--> Unable to find RPM build directory."
+ echo "--> Aborting in despair :-("
+ exit 1
fi
echo "--> Found RPM top dir: $rpmtopdir"
***************
*** 146,154 ****
#
# build the OSCAR RPM
#
echo "--> Building the OSCAR RPM"
! cmd="rpm -ba --target=$oscar_target $specdest"
echo "--> $cmd"
eval $cmd
--- 152,171 ----
#
+ # what command to use?
+ #
+
+ which rpmbuild
+ if test "$?" = "0"; then
+ rpm_cmd="rpmbuild"
+ else
+ rpm_cmd="rpm"
+ fi
+
+ #
# build the OSCAR RPM
#
echo "--> Building the OSCAR RPM"
! cmd="$rpm_cmd -ba --target=$oscar_target $specdest"
echo "--> $cmd"
eval $cmd
***************
*** 168,172 ****
exit 1
fi
! echo "--> Done building the OSCAR RPM"
#
--- 185,202 ----
exit 1
fi
!
! #
! # Remove the build trees
! #
!
! dir="$rpmtopdir/BUILD/`basename $tarball_modules`"
! dir="`echo $dir | sed -e 's/.tar.gz$//'`"
! echo "--> removing directory: $dir"
! rm -rf $dir
!
! dir="$rpmtopdir/BUILD/`basename $tarball_modules_oscar`"
! dir="`echo $dir | sed -e 's/.tar.gz$//'`"
! echo "--> removing directory: $dir"
! rm -rf $dir
#
Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** modules-oscar.spec 21 Jul 2003 10:44:38 -0000 1.15
--- modules-oscar.spec 21 Jul 2003 13:02:01 -0000 1.16
***************
*** 18,21 ****
--- 18,22 ----
%define _moddir /opt/modules
%define _profiledir /etc/profile.d
+ %define _modrpmfilelist /etc/%{name}-%{version}-rpmfiles
# Added to get around RPM 4.2 debugging additions (starting in RH 8.0)
***************
*** 72,75 ****
--- 73,81 ----
%setup -q -T -D -b 1 -n modules-%{version}
+ # Otherwise, this directory shows up on security reports
+
+ chmod -R o-w $RPM_BUILD_DIR/modules-oscar-@MORPM_VERSION@
+ chmod -R o-w $RPM_BUILD_DIR/modules-%{version}
+
#############################################################################
***************
*** 289,293 ****
bashfile="/etc/bashrc";
if test ! -f $bashfile; then
! bashfile=/etc/bash.bashrc
if test ! -f $bashfile; then
echo "Can't find bash startup file to edit. :-("
--- 295,299 ----
bashfile="/etc/bashrc";
if test ! -f $bashfile; then
! bashfile="/etc/bash.bashrc"
if test ! -f $bashfile; then
echo "Can't find bash startup file to edit. :-("
***************
*** 300,304 ****
grep $localfile $bashfile 2>&1 > /dev/null
if test "$?" = "0"; then
! bashfile=$"localfile"
fi
--- 306,310 ----
grep $localfile $bashfile 2>&1 > /dev/null
if test "$?" = "0"; then
! bashfile="$localfile"
fi
***************
*** 315,319 ****
# essentially the same reasons. Sucks!!
! cshfile="/etc/cshrc";
if test ! -f $cshfile; then
echo "Can't find csh startup file to edit. :-("
--- 321,325 ----
# essentially the same reasons. Sucks!!
! cshfile="/etc/csh.cshrc";
if test ! -f $cshfile; then
echo "Can't find csh startup file to edit. :-("
***************
*** 325,332 ****
grep $localfile $cshfile 2>&1 > /dev/null
if test "$?" = "0"; then
! cshfile=$"localfile"
fi
! if test -f "$bashfile"; then
%__cp $cshfile $cshfile.rpmsave
fi
--- 331,338 ----
grep $localfile $cshfile 2>&1 > /dev/null
if test "$?" = "0"; then
! cshfile="$localfile"
fi
! if test -f "$cshfile"; then
%__cp $cshfile $cshfile.rpmsave
fi
***************
*** 339,342 ****
--- 345,357 ----
unset special_string
+ # Save the names of the files that we altered so that %postun can know
+ # what files to clean.
+
+ rm -f %{_modrpmfilelist}
+ cat > %{_modrpmfilelist} <<EOF
+ $bashfile
+ $cshfile
+ EOF
+
#############################################################################
***************
*** 349,363 ****
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
! # 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
--- 364,377 ----
special_string="MODULES-%{version}-%{release}-RPM-ADDITION"
! # Look for the listing of the files that we modified
! if test -f %{_modrpmfilelist}; then
! for file in `cat %{_modrpmfilelist}`; do
! egrep -v '^.*# '$special_string $file > $file.tmp
! %__cp $file.tmp $file
! %__rm -f $file.tmp
! done
! rm -f %{_moddir}/%{version}/share/rpmfiles
! fi
|
|
From: Jeff S. <jsq...@us...> - 2003-07-21 10:44:42
|
Update of /cvsroot/env-switcher/modules-oscar/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv19583/dist
Modified Files:
VERSION modules-oscar.spec
Log Message:
Updates for SuSE 8.1 and 8.2
Index: VERSION
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/VERSION,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** VERSION 27 Oct 2002 13:23:06 -0000 1.5
--- VERSION 21 Jul 2003 10:44:38 -0000 1.6
***************
*** 1,5 ****
major=1
minor=0
! release=4
alpha=0
beta=0
--- 1,5 ----
major=1
minor=0
! release=5
alpha=0
beta=0
Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** modules-oscar.spec 17 Jul 2003 13:51:51 -0000 1.14
--- modules-oscar.spec 21 Jul 2003 10:44:38 -0000 1.15
***************
*** 255,264 ****
%post
! # Now make /etc/bashrc source the %{_profiledir}/00-modules.sh files.
! # Blech. We have to do this because some distros (e.g., RH 7.1) have
! # a /etc/bashrc that doesn't run the scrips in /etc/profile.d for
! # non-interactive shells (e.g., rsh somehost who). Sucks!!
! # Summation of cases:
# - bash user logs in: /etc/profile is run, all /etc/profile.d/*.sh
# scripts are run
--- 255,269 ----
%post
! # Now make the bash system startup file source the
! # %{_profiledir}/00-modules.sh files. Blech. We have to do this
! # because some distros (e.g., RH 7.1) have a /etc/bashrc that doesn't
! # run the scrips in /etc/profile.d for non-interactive shells (e.g.,
! # rsh somehost who). Sucks!!
! special_string="MODULES-%{version}-%{release}-RPM-ADDITION"
!
! # NOTE: This acts different on different Linux distros. :-(
!
! # Summation of cases (RH 7.x/8.0/9.x, MDK 8.x/9.x)
# - bash user logs in: /etc/profile is run, all /etc/profile.d/*.sh
# scripts are run
***************
*** 270,277 ****
# /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
--- 275,310 ----
# /etc/bashrc is run, and all /etc/profile.d/*.sh scripts are run
! # Strategy for modifying the top-level bash startup file:
! # 1a. If /etc/bashrc exists, use that
! # 1b. If not, if /etc/bash.bashrc exists, use that
! # 1c. If not, abort
! # 2. If "/etc/bash.bashrc.local" exists in the file, use
! # /etc/bash.bashrc.local
!
! # For SuSE 8.1 and 8.2, we can simply put things in
! # /etc/bash.bashrc.local and /etc/csh.cshrc.local -- no need to modify
! # the system-level files.
!
! bashfile="/etc/bashrc";
! if test ! -f $bashfile; then
! bashfile=/etc/bash.bashrc
! if test ! -f $bashfile; then
! echo "Can't find bash startup file to edit. :-("
! echo "Aborting in despair!"
! exit 1
! fi
! fi
!
! localfile="/etc/bash.bashrc.local"
! grep $localfile $bashfile 2>&1 > /dev/null
! if test "$?" = "0"; then
! bashfile=$"localfile"
! fi
!
! if test -f "$bashfile"; then
! %__cp $bashfile $bashfile.rpmsave
! fi
! %__cat >> $bashfile <<EOF
if test "\$MODULE_OSCAR" = "" -a -f %{_profiledir}/00-modules.sh; then # $special_string
. %{_profiledir}/00-modules.sh # $special_string
***************
*** 282,287 ****
# essentially the same reasons. Sucks!!
! %__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
--- 315,335 ----
# essentially the same reasons. Sucks!!
! cshfile="/etc/cshrc";
! if test ! -f $cshfile; then
! echo "Can't find csh startup file to edit. :-("
! echo "Aborting in despair!"
! exit 1
! fi
!
! localfile="/etc/csh.cshrc.local"
! grep $localfile $cshfile 2>&1 > /dev/null
! if test "$?" = "0"; then
! cshfile=$"localfile"
! fi
!
! if test -f "$bashfile"; then
! %__cp $cshfile $cshfile.rpmsave
! fi
! %__cat >> $cshfile <<EOF
if ("\$?MODULE_OSCAR" == "0" && -f %{_profiledir}/00-modules.csh) then # $special_string
source %{_profiledir}/00-modules.csh # $special_string
***************
*** 362,365 ****
--- 410,417 ----
#############################################################################
%changelog
+ * Sun Jul 20 2003 Jeff Squyres <jsq...@la...>
+ - Updates for SuSE 8.1 and 8.2; be a little smarter about bash and csh
+ startup files
+
* Wed Jul 16 2003 21:02:42PM Thomas Naughton <nau...@or...>
- Release 3.1.6-3
|
|
From: Jeff S. <jsq...@us...> - 2003-07-19 18:23:19
|
Update of /cvsroot/env-switcher/env-switcher/dist In directory sc8-pr-cvs1:/tmp/cvs-serv4013/dist Modified Files: VERSION Log Message: Onwards to 1.0.11. Index: VERSION =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/dist/VERSION,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** VERSION 19 Jul 2003 18:11:33 -0000 1.10 --- VERSION 19 Jul 2003 18:23:16 -0000 1.11 *************** *** 1,5 **** major=1 minor=0 ! release=10 alpha=0 beta=0 --- 1,5 ---- major=1 minor=0 ! release=11 alpha=0 beta=0 |
|
From: Jeff S. <jsq...@us...> - 2003-07-19 18:11:36
|
Update of /cvsroot/env-switcher/env-switcher In directory sc8-pr-cvs1:/tmp/cvs-serv2429 Modified Files: INSTALL LICENSE README Log Message: Updates to handle multiple default files; need to handle "split" of "switcher --show-exec" output, as well as pass through any error output lines. Thanks to Justin MacCallum for pointing this out. Index: INSTALL =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** INSTALL 11 Oct 2002 17:00:43 -0000 1.2 --- INSTALL 19 Jul 2003 18:11:33 -0000 1.3 *************** *** 1,6 **** -*- text -*- ! Copyright (c) 2002 The Trustees of Indiana University. ! All rights reserved. This file is part of the Env-switcher software package. For license --- 1,6 ---- -*- text -*- ! Copyright (c) 2002-2003 The Trustees of Indiana University. ! All rights reserved. This file is part of the Env-switcher software package. For license Index: LICENSE =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/LICENSE,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** LICENSE 29 Oct 2002 16:20:52 -0000 1.3 --- LICENSE 19 Jul 2003 18:11:33 -0000 1.4 *************** *** 1,6 **** Software License for Env-switcher ! Copyright (c) 2002 The Trustees of Indiana University. ! All rights reserved. Indiana University has the exclusive rights to license this product --- 1,6 ---- Software License for Env-switcher ! Copyright (c) 2002-2003 The Trustees of Indiana University. ! All rights reserved. Indiana University has the exclusive rights to license this product Index: README =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** README 11 Oct 2002 17:00:43 -0000 1.3 --- README 19 Jul 2003 18:11:33 -0000 1.4 *************** *** 1,6 **** -*- text -*- ! Copyright (c) 2002 The Trustees of Indiana University. ! All rights reserved. This file is part of the Env-switcher software package. For license --- 1,6 ---- -*- text -*- ! Copyright (c) 2002-2003 The Trustees of Indiana University. ! All rights reserved. This file is part of the Env-switcher software package. For license |
|
From: Jeff S. <jsq...@us...> - 2003-07-19 18:11:36
|
Update of /cvsroot/env-switcher/env-switcher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2429/src
Modified Files:
switcher.tcl.in
Log Message:
Updates to handle multiple default files; need to handle "split" of
"switcher --show-exec" output, as well as pass through any error output
lines. Thanks to Justin MacCallum for pointing this out.
Index: switcher.tcl.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.tcl.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** switcher.tcl.in 11 Oct 2002 17:00:45 -0000 1.9
--- switcher.tcl.in 19 Jul 2003 18:11:33 -0000 1.10
***************
*** 1,6 ****
#%Module -*- tcl -*-
#
! # Copyright (c) 2002 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the Env-switcher software package. For license
--- 1,6 ----
#%Module -*- tcl -*-
#
! # Copyright (c) 2002-2003 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the Env-switcher software package. For license
***************
*** 23,26 ****
--- 23,54 ----
module-whatis "Sets up the OSCAR switcher subsystem."
+ proc process_switcher_output {action output} {
+
+ # We may well have gotten multiple lines from the output of
+ # switcher. So split them by \n, and process them individually.
+
+ set lines [split $output "\n"]
+ foreach line $lines {
+
+ # If we got a line beginning with "echo", then switcher just
+ # wanted this line output. So just output it.
+
+ if { [string first "echo" $line] == 0 } {
+ puts "$line"
+ } else {
+
+ # Otherwise, it was a module name. So either load or unload it.
+
+ if { [string compare "load" $action] == 0 } {
+ module load $line
+ } elseif { [string compare "unload" $action] == 0 } {
+ module unload $line
+ } else {
+ puts "echo ERROR: Unknown switcher action ($action): '$line' ignored;"
+ }
+ }
+ }
+ }
+
# If we're removing the switcher module, unload all the modules that
# switcher loaded.
***************
*** 30,41 ****
if { $have_switcher && $am_removing } {
! set announce_output [exec switcher --announce]
! if { $announce_output != ""} {
! puts "$announce_output"
! }
! set modules_to_load [exec switcher --show-exec]
! if { $modules_to_load != "" } {
! module unload $modules_to_load
! }
}
--- 58,63 ----
if { $have_switcher && $am_removing } {
! process_switcher_output "announce" [exec switcher --announce]
! process_switcher_output "unload" [exec switcher --show-exec]
}
***************
*** 54,61 ****
if { $have_switcher && ! $am_removing } {
! 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
--- 76,80 ----
if { $have_switcher && ! $am_removing } {
! process_switcher_output "announce" [exec switcher --announce]
# Now invoke the switcher perl script to get a list of the modules
***************
*** 63,69 ****
# them. Only do this if we're loading the module.
! set modules_to_load [exec switcher --show-exec]
! if { $modules_to_load != "" } {
! module load $modules_to_load
! }
}
--- 82,85 ----
# them. Only do this if we're loading the module.
! process_switcher_output "load" [exec switcher --show-exec]
}
|
|
From: Jeff S. <jsq...@us...> - 2003-07-19 18:11:36
|
Update of /cvsroot/env-switcher/env-switcher/dist In directory sc8-pr-cvs1:/tmp/cvs-serv2429/dist Modified Files: VERSION Log Message: Updates to handle multiple default files; need to handle "split" of "switcher --show-exec" output, as well as pass through any error output lines. Thanks to Justin MacCallum for pointing this out. Index: VERSION =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/dist/VERSION,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** VERSION 29 Oct 2002 16:20:40 -0000 1.9 --- VERSION 19 Jul 2003 18:11:33 -0000 1.10 *************** *** 1,5 **** major=1 minor=0 ! release=9 alpha=0 beta=0 --- 1,5 ---- major=1 minor=0 ! release=10 alpha=0 beta=0 |
|
From: Jeff S. <jsq...@us...> - 2003-07-17 13:51:54
|
Update of /cvsroot/env-switcher/modules-oscar/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv7954
Modified Files:
modules-oscar.spec
Log Message:
Suggestions from Tom Naughton to work around RPM 4.2 issues
Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** modules-oscar.spec 27 Oct 2002 13:23:35 -0000 1.13
--- modules-oscar.spec 17 Jul 2003 13:51:51 -0000 1.14
***************
*** 1,5 ****
#
! # Copyright (c) 2002 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the modules-oscar software package. For
--- 1,5 ----
#
! # Copyright (c) 2002-2003 The Trustees of Indiana University.
! # All rights reserved.
#
# This file is part of the modules-oscar software package. For
***************
*** 19,22 ****
--- 19,26 ----
%define _profiledir /etc/profile.d
+ # Added to get around RPM 4.2 debugging additions (starting in RH 8.0)
+ %define debug_package %{nil}
+ %define __check_files %{nil}
+
#############################################################################
***************
*** 29,33 ****
Name: modules-oscar
Version: 3.1.6
! Release: 2
License: GPL
Group: Applications/Environment
--- 33,37 ----
Name: modules-oscar
Version: 3.1.6
! Release: 3
License: GPL
Group: Applications/Environment
***************
*** 317,321 ****
%clean
! # Fix the hacks we did in %install to save an existing modules install...
%__rm -rf %{_moddir}
--- 321,326 ----
%clean
! # Fix the hacks we did in "% install" to save an existing modules
! # install...
%__rm -rf %{_moddir}
***************
*** 357,360 ****
--- 362,375 ----
#############################################################################
%changelog
+ * Wed Jul 16 2003 21:02:42PM Thomas Naughton <nau...@or...>
+ - Release 3.1.6-3
+ - Mods to work with new RPM 4.2 issues:
+ o defined debug_package=nil to override the default Debuginfo which
+ caused a bomb
+ o defined __check_files=nil to override default as suggested for
+ legacy apps, see also '/usr/lib/rpm/macros'
+ o if encounter section name twice (even in comments) freaks out so
+ I added a space BTW "% install" and "% prep" in a few places.
+
* Sun Oct 27 2002 Jeff Squyres <jsq...@la...>
- Added AUTHORS.OSCAR and LICENSE.OSCAR files to %doc
***************
*** 386,390 ****
source files were missing. Made all the additional files into a
real tarball, so the SRPM contains two tarballs. Added additional
! logic in %prep to make this all work properly.
- Ensure to save %{_profiledir}/00-modules.* if they already exist
while building this RPM.
--- 401,405 ----
source files were missing. Made all the additional files into a
real tarball, so the SRPM contains two tarballs. Added additional
! logic in "% prep" to make this all work properly.
- Ensure to save %{_profiledir}/00-modules.* if they already exist
while building this RPM.
|
|
From: Jeff S. <jsq...@us...> - 2003-02-13 22:48:34
|
Update of /cvsroot/env-switcher/env-switcher/man In directory sc8-pr-cvs1:/tmp/cvs-serv14704 Modified Files: switcher.1 Log Message: Fixed a minor typo. Thanks to Tom Naughton for pointing this out. Index: switcher.1 =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/man/switcher.1,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** switcher.1 11 Oct 2002 17:32:36 -0000 1.7 --- switcher.1 13 Feb 2003 22:48:28 -0000 1.8 *************** *** 352,356 **** .I switcher start loading that modulefile for all user shells. ! .IP "switcher mpi --rm name lam-6.5.6 --silent --force" This command is used in the %preun script of the LAM/MPI OSCAR RPM. It de-registers the name "lam-6.5.6" from switcher's repository. --- 352,356 ---- .I switcher start loading that modulefile for all user shells. ! .IP "switcher mpi --rm-name lam-6.5.6 --silent --force" This command is used in the %preun script of the LAM/MPI OSCAR RPM. It de-registers the name "lam-6.5.6" from switcher's repository. |
|
From: Jeff S. <jsq...@us...> - 2002-10-29 16:21:40
|
Update of /cvsroot/env-switcher/env-switcher/dist In directory usw-pr-cvs1:/tmp/cvs-serv12318/dist Modified Files: env-switcher.spec.in Log Message: Update changelog Index: env-switcher.spec.in =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/dist/env-switcher.spec.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** env-switcher.spec.in 27 Oct 2002 13:10:52 -0000 1.11 --- env-switcher.spec.in 29 Oct 2002 16:21:37 -0000 1.12 *************** *** 168,171 **** --- 168,175 ---- ############################################################################# %changelog + * Tue Oct 29 2002 Jeff Squyres <jsq...@la...> + - Ensure that return value from switcher executable is properly + propogated to the shell return status + * Sun Oct 27 2002 Jeff Squyres <jsq...@la...> - Added AUTHORS file to %doc list |
|
From: Jeff S. <jsq...@us...> - 2002-10-29 16:21:23
|
Update of /cvsroot/env-switcher/env-switcher/src
In directory usw-pr-cvs1:/tmp/cvs-serv12070/src
Modified Files:
switcher.in
Log Message:
- Fix minor typo
- Use exit() to ensure to propogate the return value up to be the
executable's return status
Index: switcher.in
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/src/switcher.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** switcher.in 27 Oct 2002 12:10:31 -0000 1.12
--- switcher.in 29 Oct 2002 16:21:20 -0000 1.13
***************
*** 471,475 ****
if (! -d $dir) {
print_error("Error: tag directory \"$dir\" does not exist\n");
! return ;1
}
--- 471,475 ----
if (! -d $dir) {
print_error("Error: tag directory \"$dir\" does not exist\n");
! return 1;
}
***************
*** 1454,1456 ****
# Done
! $return_value;
--- 1454,1456 ----
# Done
! exit($return_value);
|
|
From: Jeff S. <jsq...@us...> - 2002-10-29 16:20:55
|
Update of /cvsroot/env-switcher/env-switcher
In directory usw-pr-cvs1:/tmp/cvs-serv11936
Modified Files:
LICENSE
Log Message:
Remove extraneous empty line
Index: LICENSE
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/LICENSE,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LICENSE 11 Oct 2002 17:00:43 -0000 1.2
--- LICENSE 29 Oct 2002 16:20:52 -0000 1.3
***************
*** 37,41 ****
contact Indiana University Advanced Research & Technology
Institute.
-
5) Products derived from this software may not be called
"Env-switcher", nor may "Env-switcher" appear in their name,
--- 37,40 ----
|
|
From: Jeff S. <jsq...@us...> - 2002-10-29 16:20:43
|
Update of /cvsroot/env-switcher/env-switcher/dist In directory usw-pr-cvs1:/tmp/cvs-serv11835/dist Modified Files: VERSION Log Message: Bump up to 1.0.9 Index: VERSION =================================================================== RCS file: /cvsroot/env-switcher/env-switcher/dist/VERSION,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** VERSION 27 Oct 2002 12:10:45 -0000 1.8 --- VERSION 29 Oct 2002 16:20:40 -0000 1.9 *************** *** 1,5 **** major=1 minor=0 ! release=8 alpha=0 beta=0 --- 1,5 ---- major=1 minor=0 ! release=9 alpha=0 beta=0 |
|
From: Jeff S. <jsq...@us...> - 2002-10-27 13:23:40
|
Update of /cvsroot/env-switcher/modules-oscar/dist
In directory usw-pr-cvs1:/tmp/cvs-serv14862
Modified Files:
modules-oscar.spec
Log Message:
Ensure to copy the LICENSE.OSCAR and AUTHORS.OSCAR file over when
building the RPM.
Index: modules-oscar.spec
===================================================================
RCS file: /cvsroot/env-switcher/modules-oscar/dist/modules-oscar.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** modules-oscar.spec 27 Oct 2002 13:13:13 -0000 1.12
--- modules-oscar.spec 27 Oct 2002 13:23:35 -0000 1.13
***************
*** 134,140 ****
%__mkdir_p %{_moddir}/oscar-modulefiles
! # Install the README.OSCAR file
srcdir="$RPM_BUILD_DIR/modules-oscar-@MORPM_VERSION@"
%__cp $srcdir/README.OSCAR .
# Install the "oscar" module and set its default
--- 134,142 ----
%__mkdir_p %{_moddir}/oscar-modulefiles
! # Install the *.OSCAR files
srcdir="$RPM_BUILD_DIR/modules-oscar-@MORPM_VERSION@"
%__cp $srcdir/README.OSCAR .
+ %__cp $srcdir/LICENSE.OSCAR .
+ %__cp $srcdir/AUTHORS.OSCAR .
# Install the "oscar" module and set its default
|
