Fixed wrong path ordering in GMX.bash introduced in commit 58a6b0bee590c2293fbf3eb359...

diff --git a/scripts/GMXRC.bash.cmakein b/scripts/GMXRC.bash.cmakein
index 45e44c5a049f7e3db4e3775bc31a479fb4504255..34941bd5a63a1e97e434d01113c2313c62663abe 100644 (file)
--- a/scripts/GMXRC.bash.cmakein
+++ b/scripts/GMXRC.bash.cmakein
@@ -8,7 +8,7 @@
 tmppath=""
 for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 LD_LIBRARY_PATH=$tmppath
@@ -17,7 +17,7 @@ LD_LIBRARY_PATH=$tmppath
 tmppath=""
 for i in `echo $PKG_CONFIG_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB/pkgconfig"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PKG_CONFIG_PATH=$tmppath
@@ -26,7 +26,7 @@ PKG_CONFIG_PATH=$tmppath
 tmppath=""
 for i in `echo $PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXBIN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PATH=$tmppath
@@ -35,7 +35,7 @@ PATH=$tmppath
 tmppath=""
 for i in `echo $MANPATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXMAN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 MANPATH=$tmppath

diff --git a/scripts/GMXRC.bash.in b/scripts/GMXRC.bash.in
index a4e8aa361e399702e8c10b8e35d0edf475d83db2..b60dc0cf3aa6e1b9f3392b73267e713ead7306cd 100644 (file)
--- a/scripts/GMXRC.bash.in
+++ b/scripts/GMXRC.bash.in
@@ -8,7 +8,7 @@
 tmppath=""
 for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 LD_LIBRARY_PATH=$tmppath
@@ -17,7 +17,7 @@ LD_LIBRARY_PATH=$tmppath
 tmppath=""
 for i in `echo $PKG_CONFIG_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB/pkgconfig"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PKG_CONFIG_PATH=$tmppath
@@ -26,7 +26,7 @@ PKG_CONFIG_PATH=$tmppath
 tmppath=""
 for i in `echo $PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXBIN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PATH=$tmppath
@@ -35,7 +35,7 @@ PATH=$tmppath
 tmppath=""
 for i in `echo $MANPATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXMAN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 MANPATH=$tmppath

diff --git a/scripts/GMXRC.zsh.cmakein b/scripts/GMXRC.zsh.cmakein
index 750c0501119db8acd93bfcd36b02b785fe4f8bf9..af52294e6f53acfc201788125778be205f0f9142 100644 (file)
--- a/scripts/GMXRC.zsh.cmakein
+++ b/scripts/GMXRC.zsh.cmakein
@@ -12,7 +12,7 @@
 tmppath=""
 for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 LD_LIBRARY_PATH=$tmppath
@@ -21,7 +21,7 @@ LD_LIBRARY_PATH=$tmppath
 tmppath=""
 for i in `echo $PKG_CONFIG_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB/pkgconfig"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PKG_CONFIG_PATH=$tmppath
@@ -30,7 +30,7 @@ PKG_CONFIG_PATH=$tmppath
 tmppath=""
 for i in `echo $PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXBIN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PATH=$tmppath
@@ -39,7 +39,7 @@ PATH=$tmppath
 tmppath=""
 for i in `echo $MANPATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXMAN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 MANPATH=$tmppath

diff --git a/scripts/GMXRC.zsh.in b/scripts/GMXRC.zsh.in
index 030238465b7b7100755fb71a0fffaa13e71f1e5b..ea8bd1449673d9299143fc75353a0ba104f46919 100644 (file)
--- a/scripts/GMXRC.zsh.in
+++ b/scripts/GMXRC.zsh.in
@@ -12,7 +12,7 @@
 tmppath=""
 for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 LD_LIBRARY_PATH=$tmppath
@@ -21,7 +21,7 @@ LD_LIBRARY_PATH=$tmppath
 tmppath=""
 for i in `echo $PKG_CONFIG_PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXLDLIB/pkgconfig"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PKG_CONFIG_PATH=$tmppath
@@ -30,7 +30,7 @@ PKG_CONFIG_PATH=$tmppath
 tmppath=""
 for i in `echo $PATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXBIN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 PATH=$tmppath
@@ -39,7 +39,7 @@ PATH=$tmppath
 tmppath=""
 for i in `echo $MANPATH | sed "s/:/ /g"`; do
   if test "$i" != "$GMXMAN"; then
-    tmppath="${i}${tmppath:+:}${tmppath}"
+    tmppath="${tmppath}${tmppath:+:}${i}"
   fi
 done
 MANPATH=$tmppath