[Genabel-commits] r1205 - pkg/ProbABEL/examples

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

Author: lckarssen
Date: 2013-05-02 17:28:49 +0200 (Thu, 02 May 2013)
New Revision: 1205

Modified:
   pkg/ProbABEL/examples/Makefile.am
   pkg/ProbABEL/examples/example_bt.sh
   pkg/ProbABEL/examples/example_mms.sh
   pkg/ProbABEL/examples/example_qt.sh
   pkg/ProbABEL/examples/run_diff.sh
Log:
This change reverts the changes from SVN r.1204 (/bin/sh to /bin/bash) made in the ProbABEL examples scripts.
Instead I set bash as the shell to use for tests in the Makefile.am. This probably works better and gives cleaner code than trying to port the bashism I used in run_diff.sh to POSIX sh. 


Modified: pkg/ProbABEL/examples/Makefile.am
===================================================================
--- pkg/ProbABEL/examples/Makefile.am	2013-05-02 13:34:24 UTC (rev 1204)
+++ pkg/ProbABEL/examples/Makefile.am	2013-05-02 15:28:49 UTC (rev 1205)
@@ -44,7 +44,7 @@
 exampledir = $(pkgdatadir)/examples
 dist_example_DATA = $(examplefiles)
 
-TESTS_ENVIRONMENT = sh
+TESTS_ENVIRONMENT = bash
 check_SCRIPTS = example_bt.sh example_qt.sh example_mms.sh
 # example_cox.sh: don't run this test. It takes several hours...
 

Modified: pkg/ProbABEL/examples/example_bt.sh
===================================================================
--- pkg/ProbABEL/examples/example_bt.sh	2013-05-02 13:34:24 UTC (rev 1204)
+++ pkg/ProbABEL/examples/example_bt.sh	2013-05-02 15:28:49 UTC (rev 1205)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This script runs checks on ProbABEL's palogist module for
 # binary traits.
 

Modified: pkg/ProbABEL/examples/example_mms.sh
===================================================================
--- pkg/ProbABEL/examples/example_mms.sh	2013-05-02 13:34:24 UTC (rev 1204)
+++ pkg/ProbABEL/examples/example_mms.sh	2013-05-02 15:28:49 UTC (rev 1205)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This script runs checks on ProbABEL's palinear module for
 # quantitative traits combined with the mmscore option.
 

Modified: pkg/ProbABEL/examples/example_qt.sh
===================================================================
--- pkg/ProbABEL/examples/example_qt.sh	2013-05-02 13:34:24 UTC (rev 1204)
+++ pkg/ProbABEL/examples/example_qt.sh	2013-05-02 15:28:49 UTC (rev 1205)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This script runs checks on ProbABEL's palinear module for
 # quantitative traits.
 

Modified: pkg/ProbABEL/examples/run_diff.sh
===================================================================
--- pkg/ProbABEL/examples/run_diff.sh	2013-05-02 13:34:24 UTC (rev 1204)
+++ pkg/ProbABEL/examples/run_diff.sh	2013-05-02 15:28:49 UTC (rev 1205)
@@ -1,4 +1,6 @@
-# This file contains a function used in the various example/test scripts
+# This file contains a function used in the various example/test
+# scripts. It relies on bashisms to get the substrings when running
+# the echo commands.
 
 run_diff()
 {