| Previous changeset 5:9692e46b267a (2019-07-08) Next changeset 7:04bdb1e66a27 (2019-08-21) |
|
Commit message:
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/chado commit bc69ce09372c8c2701b726c326e671af279adb4d |
|
modified:
expression_add_biomaterial.xml macros.xml |
| b |
| 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 |
| b |
| @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool id="expression_add_biomaterial" name="Chado biomaterial add" version="@WRAPPER_VERSION@.0"> +<tool id="expression_add_biomaterial" name="Chado biomaterial add" version="@WRAPPER_VERSION@.1"> <description></description> <macros> <import>macros.xml</import> @@ -35,7 +35,7 @@ | jq -S . > '$results' -&& @ZIP_PSQL@ +@ZIP_PSQL@ ]]></command> <inputs> <expand macro="psql_target"/> |
| b |
| 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 @@ </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 |