[Genabel-commits] r1620 - pkg/GenABEL-general/scripts

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-02-23 22:44:35 +0100 (Sun, 23 Feb 2014)
New Revision: 1620

Modified:
   pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh
Log:
Fix bug in the makedistrib_DatABEL.sh script: the -n/--nocheckout option didn't work as expected.


Modified: pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh
===================================================================
--- pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh	2014-02-23 21:35:24 UTC (rev 1619)
+++ pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh	2014-02-23 21:44:35 UTC (rev 1620)
@@ -62,6 +62,23 @@
     SVNBASE=svn://svn.r-forge.r-project.org/svnroot/genabel/
     svn export $SVNBASE/pkg/$PKG
     svn export $SVNBASE/pkg/filevector
+
+    cd DatABEL
+    rm -f cleanup* configure* *.R
+    cd src
+    cp DAlib/*.c* .
+    cp DAlib/*.h* .
+    cp ITERlib/*.c* .
+    cp ITERlib/*.h* .
+    cp fvlib/*.c* .
+    cp fvlib/*.h* .
+    rm -rf DAlib
+    rm -rf ITERlib
+    rm fvlib
+    mv Makevars_distrib Makevars
+    cd ..
+    rm -rf tests
+    cd ..
 fi
 
 # In order not to mess with the current user's R library directory we
@@ -88,26 +105,6 @@
 }
 EOF
 
-
-cd DatABEL
-rm -f cleanup* configure* *.R
-VERSION=`grep Version DESCRIPTION | cut -d" " -f2`
-cd src
-cp DAlib/*.c* .
-cp DAlib/*.h* .
-cp ITERlib/*.c* .
-cp ITERlib/*.h* .
-cp fvlib/*.c* .
-cp fvlib/*.h* .
-rm -rf DAlib
-rm -rf ITERlib
-rm fvlib
-mv Makevars_distrib Makevars
-cd ..
-rm -rf tests
-cd ..
-
-
 errwarn=0
 echo
 echo "--------------------------------------------------"