[Rivet-svn] r4103 - branches/2012-06-aidarivet trunk

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Jan 22 15:07:30 2013
New Revision: 4103

Log:
Fix TeX variable in the rivetenv scripts, especially for csh

Modified:
   branches/2012-06-aidarivet/ChangeLog
   branches/2012-06-aidarivet/rivetenv.csh.in
   branches/2012-06-aidarivet/rivetenv.sh.in
   trunk/ChangeLog
   trunk/rivetenv.csh.in
   trunk/rivetenv.sh.in

Modified: branches/2012-06-aidarivet/ChangeLog
==============================================================================
--- branches/2012-06-aidarivet/ChangeLog	Fri Dec 21 16:10:47 2012	(r4102)
+++ branches/2012-06-aidarivet/ChangeLog	Tue Jan 22 15:07:30 2013	(r4103)
@@ -1,3 +1,7 @@
+2013-01-22  Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+	* Fix TeX variable in the rivetenv scripts, especially for csh
+
 2012-12-21  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version 1.8.2 release!

Modified: branches/2012-06-aidarivet/rivetenv.csh.in
==============================================================================
--- branches/2012-06-aidarivet/rivetenv.csh.in	Fri Dec 21 16:10:47 2012	(r4102)
+++ branches/2012-06-aidarivet/rivetenv.csh.in	Tue Jan 22 15:07:30 2013	(r4103)
@@ -12,26 +12,8 @@
 setenv PYTHONPATH "@RIVET_PYTHONPATH@"
 endif
 
-if ($?TEXMFHOME) then
 setenv TEXMFHOME "@datadir@/Rivet/texmf:$TEXMFHOME"
-else
-setenv TEXMFHOME "@datadir@/Rivet/texmf"
-endif
-
-if ($?HOMETEXMF) then
 setenv HOMETEXMF "@datadir@/Rivet/texmf:$HOMETEXMF"
-else
-setenv HOMETEXMF "@datadir@/Rivet/texmf"
-endif
-
-if ($?TEXINPUTS) then
-setenv TEXINPUTS "@datadir@/Rivet/texmf:$TEXINPUTS"
-else
-setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//"
-endif
-
-if ($?LATEXINPUTS) then
-setenv LATEXINPUTS "@datadir@/Rivet/texmf:$LATEXINPUTS"
-else
-setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//"
-endif
+setenv TEXMFCNF "@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
+setenv TEXINPUTS "@datadir@/Rivet/texmf/tex:$TEXINPUTS"
+setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex:$LATEXINPUTS"

Modified: branches/2012-06-aidarivet/rivetenv.sh.in
==============================================================================
--- branches/2012-06-aidarivet/rivetenv.sh.in	Fri Dec 21 16:10:47 2012	(r4102)
+++ branches/2012-06-aidarivet/rivetenv.sh.in	Tue Jan 22 15:07:30 2013	(r4103)
@@ -10,8 +10,8 @@
 export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
 export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"
 export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
-export TEXINPUTS="@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
-export LATEXINPUTS="@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
+export TEXINPUTS="@datadir@/Rivet/texmf/tex:$TEXINPUTS"
+export LATEXINPUTS="@datadir@/Rivet/texmf/tex:$LATEXINPUTS"
 
 if (complete &> /dev/null); then
     test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion"

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Dec 21 16:10:47 2012	(r4102)
+++ trunk/ChangeLog	Tue Jan 22 15:07:30 2013	(r4103)
@@ -1,3 +1,7 @@
+2013-01-22  Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+	* Fix TeX variable in the rivetenv scripts, especially for csh
+
 2012-11-27  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Converting CMS_2012_I1102908 analysis to use YODA.

Modified: trunk/rivetenv.csh.in
==============================================================================
--- trunk/rivetenv.csh.in	Fri Dec 21 16:10:47 2012	(r4102)
+++ trunk/rivetenv.csh.in	Tue Jan 22 15:07:30 2013	(r4103)
@@ -12,26 +12,8 @@
 setenv PYTHONPATH "@RIVET_PYTHONPATH@"
 endif
 
-if ($?TEXMFHOME) then
 setenv TEXMFHOME "@datadir@/Rivet/texmf:$TEXMFHOME"
-else
-setenv TEXMFHOME "@datadir@/Rivet/texmf"
-endif
-
-if ($?HOMETEXMF) then
 setenv HOMETEXMF "@datadir@/Rivet/texmf:$HOMETEXMF"
-else
-setenv HOMETEXMF "@datadir@/Rivet/texmf"
-endif
-
-if ($?TEXINPUTS) then
-setenv TEXINPUTS "@datadir@/Rivet/texmf:$TEXINPUTS"
-else
-setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//"
-endif
-
-if ($?LATEXINPUTS) then
-setenv LATEXINPUTS "@datadir@/Rivet/texmf:$LATEXINPUTS"
-else
-setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//"
-endif
+setenv TEXMFCNF "@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
+setenv TEXINPUTS "@datadir@/Rivet/texmf/tex:$TEXINPUTS"
+setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex:$LATEXINPUTS"

Modified: trunk/rivetenv.sh.in
==============================================================================
--- trunk/rivetenv.sh.in	Fri Dec 21 16:10:47 2012	(r4102)
+++ trunk/rivetenv.sh.in	Tue Jan 22 15:07:30 2013	(r4103)
@@ -10,8 +10,8 @@
 export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
 export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"
 export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
-export TEXINPUTS="@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
-export LATEXINPUTS="@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
+export TEXINPUTS="@datadir@/Rivet/texmf/tex:$TEXINPUTS"
+export LATEXINPUTS="@datadir@/Rivet/texmf/tex:$LATEXINPUTS"
 
 if (complete &> /dev/null); then
     test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion"