From 663c08aec43498ab5c7e91f745126f7edd00496e Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Thu, 9 Dec 2021 17:54:06 +0000
Subject: [PATCH] Fix tool-provided metadata for CONVERTER_tar_to_directory

The metadata are in the "default" (not "legacy") format, so need to
use a newer tool profile.

Also:
- Use CDATA and `&&` in command
---
 .../datatypes/converters/tar_to_directory.xml | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/galaxy/datatypes/converters/tar_to_directory.xml b/lib/galaxy/datatypes/converters/tar_to_directory.xml
index 0160746283d..850a4f67e64 100644
--- a/lib/galaxy/datatypes/converters/tar_to_directory.xml
+++ b/lib/galaxy/datatypes/converters/tar_to_directory.xml
@@ -1,18 +1,23 @@
-<tool id="CONVERTER_tar_to_directory" name="Convert tar to directory" version="1.0.1" profile="17.05">
+<tool id="CONVERTER_tar_to_directory" name="Convert tar to directory" version="1.0.1" profile="21.09">
     <!-- Don't use tar directly so we can verify safety of results - tar -xzf '$input1'; -->
     <requirements>
         <requirement type="package" version="23.2.1">galaxy-util</requirement>
     </requirements>
-    <command>
-        mkdir '$output1.files_path';
-        cd '$output1.files_path';
-        python -c "from galaxy.util.compression_utils import CompressedFile; CompressedFile('$input1').extract('.');"
-    </command>
+    <command detect_errors="exit_code"><![CDATA[
+cp '$provided_metadata' 'galaxy.json' &&
+mkdir '$output1.files_path' &&
+cd '$output1.files_path' &&
+python -c "from galaxy.util.compression_utils import CompressedFile; CompressedFile('$input1').extract('.');"
+    ]]></command>
+    <configfiles>
+        <configfile name="provided_metadata">{"output1": {"created_from_basename": "${input1.created_from_basename}"}}
+</configfile>
+    </configfiles>
     <inputs>
         <param format="tar" name="input1" type="data"/>
     </inputs>
     <outputs>
-        <data format="directory" name="output1"/>
+        <data format="directory" name="output1" metadata_source="input1" />
     </outputs>
     <tests>
         <test>
@@ -20,6 +25,6 @@
             <output name="output1" ftype="directory" value="testdir1.tar.directory"/>
         </test>
     </tests>
-    <help>
-    </help>
+    <help><![CDATA[
+    ]]></help>
 </tool>