[Genabel-commits] r2043 - pkg/GenABEL-general/distrib_scripts

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

Author: lckarssen
Date: 2016-01-19 00:36:48 +0100 (Tue, 19 Jan 2016)
New Revision: 2043

Modified:
   pkg/GenABEL-general/distrib_scripts/makedistrib_GenABEL-tutorial.sh
Log:
Add --noremovedeps option to the makedistrib_GenABEL-tutorial script

This is needed because the makedistrib_GenABEL script (work in
progress) will call the makedistrib_GenABEL-tutorial script and
without this option, the GenABEL directory would be removed.


Modified: pkg/GenABEL-general/distrib_scripts/makedistrib_GenABEL-tutorial.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/makedistrib_GenABEL-tutorial.sh	2016-01-18 15:46:20 UTC (rev 2042)
+++ pkg/GenABEL-general/distrib_scripts/makedistrib_GenABEL-tutorial.sh	2016-01-18 23:36:48 UTC (rev 2043)
@@ -12,6 +12,9 @@
 #   deleted and no SVN checkout will be done. This is handy when trying
 #   out some of your local changes.
 # -u|--user <username>: Use <username> when checking out from SVN.
+# -r|--noremovedeps: don't remove any installed dependencies (by default
+#  directories of build dependencies are remove if the package is
+#  checked out from version control (i.e. if the -n option is not set).
 
 PKG=GenABEL_general
 TUT_DEPS_SVN="GenABEL GenABEL.data DatABEL MetABEL MixABEL"
@@ -30,8 +33,8 @@
 
 # Parse command line options
 NOCHECKOUT=false
-CRANCHECK=true
 SVNUSER=""
+REMOVEDEPS=true
 while [ $# -gt 0 ]; do
     case $1 in
         -n | --nocheckout )
@@ -42,6 +45,9 @@
             SVNUSER=${1:?Error: please specify SVN user name after the -u option}
             echo "Using SVN user name $SVNUSER"
             ;;
+        -r | --noremovedeps )
+            REMOVEDEPS=false
+            ;;
         -* )
             echo "$0: invalid option $1" >&2
             exit 1
@@ -58,9 +64,11 @@
 echo "--------------------------------------------------"
 if [ ${NOCHECKOUT} == false ]; then
     rm -rf ${PKG}
-    for DEP in ${TUT_DEPS_SVN} ${TUT_DEPS_GIT}; do
-        rm -rf ${DEP}
-    done
+    if [ ${REMOVEDEPS} == true ]; then
+        for DEP in ${TUT_DEPS_SVN} ${TUT_DEPS_GIT}; do
+            rm -rf ${DEP}
+        done
+    fi
 fi
 
 if [ ${NOCHECKOUT} == false ]; then