# HG changeset patch # User gga # Date 1562848693 14400 # Node ID 8c7e2b5c228fae0a0eda5b7368242c7aa9b5b83c # Parent 9692e46b267a8d0c54594c1c22fd87bfdd0251ad planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit bc69ce09372c8c2701b726c326e671af279adb4d diff -r 9692e46b267a -r 8c7e2b5c228f expression_add_biomaterial.xml --- a/expression_add_biomaterial.xml Mon Jul 08 05:38:36 2019 -0400 +++ b/expression_add_biomaterial.xml Thu Jul 11 08:38:13 2019 -0400 @@ -1,5 +1,5 @@ - + macros.xml @@ -35,7 +35,7 @@ | jq -S . > '$results' -&& @ZIP_PSQL@ +@ZIP_PSQL@ ]]> diff -r 9692e46b267a -r 8c7e2b5c228f macros.xml --- a/macros.xml Mon Jul 08 05:38:36 2019 -0400 +++ b/macros.xml Thu Jul 11 08:38:13 2019 -0400 @@ -89,32 +89,29 @@ - '.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 - ]]> - /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 ]]> /dev/null