# HG changeset patch # User gga # Date 1565791594 14400 # Node ID d55a39f12ddad5a6fbf0f7a734324734e0edac58 # Parent 468955e12255f9cf0a4adfe122bed78980e73d92 "planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/tripal commit ea279e5b47cf3d5767328d17b0e40e57b0238ea1" diff -r 468955e12255 -r d55a39f12dda db_index.xml --- a/db_index.xml Tue Mar 05 05:21:28 2019 -0500 +++ b/db_index.xml Wed Aug 14 10:06:34 2019 -0400 @@ -1,5 +1,5 @@ - + using Elasticsearch macros.xml @@ -123,8 +123,8 @@ - - + + diff -r 468955e12255 -r d55a39f12dda macros.xml --- a/macros.xml Tue Mar 05 05:21:28 2019 -0500 +++ b/macros.xml Wed Aug 14 10:06:34 2019 -0400 @@ -41,13 +41,15 @@ \$GALAXY_TRIPAL_SHARED_DIR '.auth.yml' && - echo "local:" >> '.auth.yml' && - echo " tripal_url: \"\$GALAXY_TRIPAL_URL\"" >> '.auth.yml' && - echo " username: \"\$GALAXY_TRIPAL_USER\"" >> '.auth.yml' && - echo " password: \"\$GALAXY_TRIPAL_PASSWORD\"" >> '.auth.yml' && + if [ -z "\$TRIPAILLE_GLOBAL_CONFIG_PATH" ]; then + echo "__default: local" > '.auth.yml' && + echo "local:" >> '.auth.yml' && + echo " tripal_url: \"\$GALAXY_TRIPAL_URL\"" >> '.auth.yml' && + echo " username: \"\$GALAXY_TRIPAL_USER\"" >> '.auth.yml' && + echo " password: \"\$GALAXY_TRIPAL_PASSWORD\"" >> '.auth.yml' && - TRIPAILLE_GLOBAL_CONFIG_PATH='.auth.yml' + export TRIPAILLE_GLOBAL_CONFIG_PATH='.auth.yml' + ; fi && ]]> @@ -155,7 +157,7 @@