merge branch dev

geraldinepascal · Jun 30, 2017 · 14f5705 · 14f5705
2 parents e3bd3c6 + 623d266
commit 14f5705
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/phylo_manova/r_manova.py b/tools/phylo_manova/r_manova.py
@@ -95,7 +95,7 @@ def get_version(self):
     prevent_shell_injections(args)   
     # Process 
     # keep quote around varExp
-    idx=sys.argv.index("--varExp")+1
+    idx=sys.argv.index("-v")+1 if "-v" in sys.argv else sys.argv.index("--varExp")+1 
     cmd = " ".join(sys.argv[0:idx]) + " \"" + sys.argv[idx] + "\" "
     if idx != len(sys.argv):
         cmd += " ".join(sys.argv[idx+1:])

diff --git a/tools/phylo_manova/r_manova.xml b/tools/phylo_manova/r_manova.xml
@@ -18,7 +18,7 @@
 <tool name="FROGSSTAT Phyloseq Multivariate Analysis Of Variance" id="FROGSSTAT_Phyloseq_Multivariate_Analysis_Of_Variance" version="1.0.0">
 	<command interpreter="python">r_manova.py 
                                     --data $data
-                                    --varExp \"$varExp\"
+                                    --varExp "$varExp"
                                     --distance-matrix $method
                                     --html $html
 	</command>