From f13a7afca520bc8d7d08eaf661f9714c4ee6b40d Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Tue, 15 May 2001 03:19:47 +0000
Subject: - copyright: GPL -> license: GPL - fix a syntax error in lang.csh -
 skip commented-out i18n configuration lines in lang.csh

---
 initscripts.spec | 7 ++++++-
 lang.csh         | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 871ce9c8..334ac71d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,7 +1,7 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
 Version: 5.86
-Copyright: GPL
+License: GPL
 Group: System Environment/Base
 Release: 1
 Source: initscripts-%{version}.tar.bz2
@@ -218,6 +218,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Mon May 14 2001 Nalin Dahyabhai <nalin@redhat.com>
+- copyright: GPL -> license: GPL
+- fix a syntax error in lang.csh
+- skip commented-out i18n configuration lines in lang.csh
+
 * Fri May 11 2001 Preston Brown <pbrown@redhat.com>
 - new network-scripts infrastructure; ifcfg-lo moved to /etc/sysconfig/networking
 
diff --git a/lang.csh b/lang.csh
index 1ded61c6..9adf31fb 100755
--- a/lang.csh
+++ b/lang.csh
@@ -3,7 +3,7 @@
 set sourced=0
 foreach file (/etc/sysconfig/i18n $HOME/.i18n)
 	if ( -f $file ) then
-	    eval `sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' $file | sed 's|$|;|' `
+	    eval `grep -v '^[:blank:]*#' $file | sed 's|\([^=]*\)=\([^=]*\)|setenv \1 \2|g' | sed 's|$|;|'`
 	endif
 	set sourced=1
 end
@@ -35,7 +35,7 @@ if ($sourced == 1) then
                     endif
                 endif
                 breaksw
-        endif
+	endsw
     endif
     if ($?SYSFONTACM) then
         switch ($SYSFONTACM)
-- 
cgit v1.2.1