# HG changeset patch
# User bgruening
# Date 1381306447 14400
# Node ID 5d4078513d71bed6999112c8bdb340b0ed00003b
# Parent  05cbf681c94850a0c9593594ddeca26faba50d26
Uploaded

diff -r 05cbf681c948 -r 5d4078513d71 tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Oct 04 05:20:25 2013 -0400
+++ b/tool_dependencies.xml	Wed Oct 09 04:14:07 2013 -0400
@@ -18,8 +18,8 @@
     <package name="antismash_python_deps" version="2.0.2">
         <install version="1.0">
             <actions>
-                <action type="setup_virtualenv">helperlibs=0.1.2
-straight.plugin=1.4.0-post-1</action>
+                <action type="setup_virtualenv">helperlibs==0.1.2
+straight.plugin==1.4.0-post-1</action>
             </actions>
         </install>
         <readme>
@@ -30,7 +30,18 @@
         <install version="1.0">
            <actions_group>
                 <!-- Download the binaries for MUSCLE compatible with 64-bit OSX. -->
-                <actions os="darwin">
+                <actions architecture="x86_64" os="darwin">
+                    <action type="download_by_url">https://bitbucket.org/antismash/antismash2/downloads/antiSMASH2.0.2_macosx.zip</action>
+                    <action type="move_directory_files">
+                        <source_directory>.</source_directory>
+                        <destination_directory>$INSTALL_DIR</destination_directory>
+                    </action>
+                    <action type="chmod">
+                        <file mode="750">$INSTALL_DIR/run_antismash.py</file>
+                    </action>
+                </actions>
+                <!-- Download the binaries for MUSCLE compatible with 64-bit OSX. -->
+                <actions architecture="i386" os="darwin">
                     <action type="download_by_url">https://bitbucket.org/antismash/antismash2/downloads/antiSMASH2.0.2_macosx.zip</action>
                     <action type="move_directory_files">
                         <source_directory>.</source_directory>
@@ -44,7 +55,7 @@
                 <actions architecture="x86_64" os="linux">
                     <action target_filename="antismash-2.0.2.tar.bz2" type="download_by_url">https://bitbucket.org/antismash/antismash2/downloads/antismash-2.0.2.x86_64.tar.bz2</action>
                     <action type="move_directory_files">
-                        <source_directory>.</source_directory>
+                        <source_directory>antismash-2.0.2/*</source_directory>
                         <destination_directory>$INSTALL_DIR</destination_directory>
                     </action>
                     <action type="chmod">
@@ -53,7 +64,7 @@
                     <action type="download_by_url">https://bitbucket.org/antismash/antismash2/downloads/clusterblast.tar.gz</action>
                     <action type="move_directory_files">
                         <source_directory>.</source_directory>
-                        <destination_directory>$INSTALL_DIR/antismash-2.0.2/antismash/generic_modules/clusterblast</destination_directory>
+                        <destination_directory>$INSTALL_DIR/antismash/generic_modules/clusterblast</destination_directory>
                     </action>
                 </actions>
                 <!-- Download the binaries for AntiSmash compatible with 32-bit Linux. -->
@@ -69,14 +80,7 @@
                 </actions>
 
                 <actions>
-                    <action type="download_by_url">https://bitbucket.org/antismash/antismash2/downloads/antismash-2.0.2.x86_64.tar.bz2</action>
-                    <action type="move_directory_files">
-                        <source_directory>.</source_directory>
-                        <destination_directory>$INSTALL_DIR</destination_directory>
-                    </action>
-                    <action type="chmod">
-                        <file mode="750">$INSTALL_DIR/run_antismash.py</file>
-                    </action>
+
                 </actions>
 
                 <!-- The $PATH environment variable is only set if one of the above <actions> tags resulted in a successful installation. -->