diff tools/mira4_0/mira4_bait.py @ 35:259891fce7fd draft

planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira4_0 commit e4c56df75150c82d3e9c4ac487c4209108e52412

--- a/tools/mira4_0/mira4_bait.py	Wed Jun 07 12:33:39 2017 -0400
+++ b/tools/mira4_0/mira4_bait.py	Wed Aug 09 13:32:11 2017 -0400
@@ -10,7 +10,7 @@
 import sys
 import time
 
-WRAPPER_VER = "0.0.10"  # Keep in sync with the XML file
+WRAPPER_VER = "0.0.11"  # Keep in sync with the XML file
 
 
 def get_version(mira_binary):
@@ -37,14 +37,17 @@
     return ver.split("\n", 1)[0]
 
 
-try:
+if "MIRA4" in os.environ:
     mira_path = os.environ["MIRA4"]
-except KeyError:
-    sys.exit("Environment variable $MIRA4 not set")
-mira_binary = os.path.join(mira_path, "mirabait")
-if not os.path.isfile(mira_binary):
-    sys.exit("Missing mirabait under $MIRA4, %r\nFolder contained: %s"
-             % (mira_binary, ", ".join(os.listdir(mira_path))))
+    mira_binary = os.path.join(mira_path, "mirabait")
+    if not os.path.isfile(mira_binary):
+        sys.exit("Missing mirabait under $MIRA4, %r\nFolder contained: %s"
+                 % (mira_binary, ", ".join(os.listdir(mira_path))))
+else:
+    sys.stderr.write("DEBUG: Since $MIRA4 is not set, assuming mira binaries are on $PATH.\n")
+    mira_path = None
+    mira_binary = "mirabait"
+
 mira_ver = get_version(mira_binary)
 if not mira_ver.strip().startswith("4.0"):
     sys.exit("This wrapper is for MIRA V4.0, not:\n%s" % mira_ver)