From 986a3c39b96bd352aa7574a84a2efede3595b64b Mon Sep 17 00:00:00 2001
From: aknecht2 <aknecht2@unl.edu>
Date: Thu, 16 Mar 2017 15:57:12 -0500
Subject: [PATCH] Updated wrapper parsing and added better wrapper name to spp.
---
.../wrappers/{r_spp_nodups_wrapper.sh => spp_nodups_wrapper.sh} | 0
chipathlon/workflow.py | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename chipathlon/jobs/wrappers/{r_spp_nodups_wrapper.sh => spp_nodups_wrapper.sh} (100%)
diff --git a/chipathlon/jobs/wrappers/r_spp_nodups_wrapper.sh b/chipathlon/jobs/wrappers/spp_nodups_wrapper.sh
similarity index 100%
rename from chipathlon/jobs/wrappers/r_spp_nodups_wrapper.sh
rename to chipathlon/jobs/wrappers/spp_nodups_wrapper.sh
diff --git a/chipathlon/workflow.py b/chipathlon/workflow.py
index 6254d05..e444b38 100644
--- a/chipathlon/workflow.py
+++ b/chipathlon/workflow.py
@@ -141,7 +141,7 @@ class Workflow(object):
# Load wrapper scripts for commands that need to be loaded from module
for root, dirs, files in os.walk("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), chipathlon.conf.job_wrappers)):
for f in files:
- self._add_executable(f.split("_")[0], os.path.join(root, f))
+ self._add_executable("_".join(f.split("_")[:-1]), os.path.join(root, f))
break
# Load actual scripts
for root, dirs, files in os.walk("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), chipathlon.conf.job_scripts)):
--
GitLab