Mercurial > repos > da-intersect > test_ap11

changeset 46:739bf5324d63 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge heads at 34:55f937f289b2 and 45:b5b253a92efe which were created as a result of a recently fixed bug.
author devteam <devteam@galaxyproject.org>
date Mon, 13 Jan 2014 12:45:44 -0500
parents b5b253a92efe (diff) 55f937f289b2 (current diff)
children
files
diffstat 12 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
Binary file jars/protein_generator.jar has changed
Binary file jars/results_analyser.jar has changed
Binary file jars/samifier.jar has changed
Binary file jars/virtual_protein_merger.jar has changed
Binary file protein_generator.jar has changed
--- a/protein_generator.sh	Wed May 01 11:10:55 2013 +1000
+++ b/protein_generator.sh	Mon Jan 13 12:45:44 2014 -0500
@@ -19,7 +19,7 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-jar_path="${DIR}/jars/${1}"
+jar_path="${DIR}/${1}"
 shift
 
 java -Xmx3072M -jar $jar_path $@
--- a/protein_merger.sh	Wed May 01 11:10:55 2013 +1000
+++ b/protein_merger.sh	Mon Jan 13 12:45:44 2014 -0500
@@ -19,7 +19,7 @@
 
 # Locate the jar directory
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-jar_path="${DIR}/jars/${1}"
+jar_path="${DIR}/${1}"
 shift
 
 # Untar the chromosome file into a temporary directory
--- a/result_analyser.sh	Wed May 01 11:10:55 2013 +1000
+++ b/result_analyser.sh	Mon Jan 13 12:45:44 2014 -0500
@@ -19,7 +19,7 @@
 
 # Locate the jar directory
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-jar_path="${DIR}/jars/${1}"
+jar_path="${DIR}/${1}"
 shift
 
 # Untar the chromosome file into a temporary directory
Binary file results_analyser.jar has changed
Binary file samifier.jar has changed
--- a/samifier.sh	Wed May 01 11:10:55 2013 +1000
+++ b/samifier.sh	Mon Jan 13 12:45:44 2014 -0500
@@ -19,7 +19,7 @@
 
 # Locate the jar directory
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-jar_path="${DIR}/jars/${1}"
+jar_path="${DIR}/${1}"
 shift
 
 # Untar the chromosome file into a temporary directory
Binary file virtual_protein_merger.jar has changed