# HG changeset patch
# User gga
# Date 1562848619 14400
# Node ID 546ea3a2a7f7f31b2243526098a7bb7010e9d53a
# Parent  a64f1f154f8ceaafa74a21aee73adf8a7d6cbbc3
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit bc69ce09372c8c2701b726c326e671af279adb4d

diff -r a64f1f154f8c -r 546ea3a2a7f7 expression_add_expression.xml
--- a/expression_add_expression.xml	Mon Jul 08 05:37:07 2019 -0400
+++ b/expression_add_expression.xml	Thu Jul 11 08:36:59 2019 -0400
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tool id="expression_add_expression" name="Chado expression add" version="@WRAPPER_VERSION@.0">
+<tool id="expression_add_expression" name="Chado expression add" version="@WRAPPER_VERSION@.1">
     <description></description>
     <macros>
         <import>macros.xml</import>
@@ -16,7 +16,7 @@
 
  > '$results'
 
-&& @ZIP_PSQL@
+@ZIP_PSQL@
     ]]></command>
     <inputs>
         <expand macro="psql_target"/>
diff -r a64f1f154f8c -r 546ea3a2a7f7 macros.xml
--- a/macros.xml	Mon Jul 08 05:37:07 2019 -0400
+++ b/macros.xml	Thu Jul 11 08:36:59 2019 -0400
@@ -89,32 +89,29 @@
       </conditional>
     </xml>
 
-    <token name="@AUTH@"><![CDATA[
-        if [ -z "$CHAKIN_GLOBAL_CONFIG_PATH" ]; then
-          echo "__default: local" > '.auth.yml' &&
-          echo "local:" >> '.auth.yml' &&
-          echo "    dbhost: \"\$GALAXY_CHADO_DBHOST\"" >> '.auth.yml' &&
-          echo "    dbname: \"\$GALAXY_CHADO_DBNAME\"" >> '.auth.yml' &&
-          echo "    dbpass: \"\$GALAXY_CHADO_DBPASS\"" >> '.auth.yml' &&
-          echo "    dbuser: \"\$GALAXY_CHADO_DBUSER\"" >> '.auth.yml' &&
-          echo "    dbschema: \"\$GALAXY_CHADO_DBSCHEMA\"" >> '.auth.yml' &&
-          echo "    dbport: \"\$GALAXY_CHADO_DBPORT\"" >> '.auth.yml' &&
-
-          export CHAKIN_GLOBAL_CONFIG_PATH='.auth.yml'
-        ; fi
-    ]]></token>
-
     <token name="@START_PSQL@"><![CDATA[
         #if $psql_target.method == 'pgtools'
             tar -xjvf '$psql_target.infile' > /dev/null &&
             . '$__tool_directory__/prepare_psql.sh' '$psql_target.schema'
         #else
-            @AUTH@
+            if [ -z "\$CHAKIN_GLOBAL_CONFIG_PATH" ]; then
+              echo "__default: local" > '.auth.yml' &&
+              echo "local:" >> '.auth.yml' &&
+              echo "    dbhost: \"\$GALAXY_CHADO_DBHOST\"" >> '.auth.yml' &&
+              echo "    dbname: \"\$GALAXY_CHADO_DBNAME\"" >> '.auth.yml' &&
+              echo "    dbpass: \"\$GALAXY_CHADO_DBPASS\"" >> '.auth.yml' &&
+              echo "    dbuser: \"\$GALAXY_CHADO_DBUSER\"" >> '.auth.yml' &&
+              echo "    dbschema: \"\$GALAXY_CHADO_DBSCHEMA\"" >> '.auth.yml' &&
+              echo "    dbport: \"\$GALAXY_CHADO_DBPORT\"" >> '.auth.yml' &&
+
+              export CHAKIN_GLOBAL_CONFIG_PATH='.auth.yml'
+            ; fi
         #end if
     ]]></token>
 
     <token name="@STOP_PSQL@"><![CDATA[
         #if $psql_target.method == 'pgtools'
+            &&
             pglite stop -d ./postgresql &&
             timeout 60 bash -c 'until pglite status -d ./postgresql | grep -F -q "no server running"; do sleep 1; done'
             ;
@@ -125,6 +122,7 @@
 
     <token name="@ZIP_PSQL@"><![CDATA[
         #if $psql_target.method == 'pgtools'
+            &&
             pglite stop -d ./postgresql &&
             timeout 60 bash -c 'until pglite status -d ./postgresql | grep -F -q "no server running"; do sleep 1; done' &&
             tar -cvjf postgresql_out.tar.bz2 postgresql > /dev/null