changeset 8:258bef815327 draft

planemo upload for repository https://github.com/ErasmusMC-Bioinformatics/ega_client_galaxy_wrapper commit 63cc1d3eba84a01ae7e9da734ed91f5b531e4a91-dirty
author yhoogstrate
date Tue, 29 Mar 2016 07:41:51 -0400
parents a727830ece13
children 6d0453b21b1c
files ega_download_streamer.xml
diffstat 1 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ega_download_streamer.xml	Tue Mar 29 07:27:23 2016 -0400
+++ b/ega_download_streamer.xml	Tue Mar 29 07:41:51 2016 -0400
@@ -21,7 +21,7 @@
         echo \$user > credentials.txt &&
         echo \$pass >> credentials.txt &&
         
-        echo "Creating an encryption request at server" && 
+        echo "Creating an encryption request at server:" && 
         
         if java -jar
             "\$JAVA_JAR_PATH/EgaDemoClient.jar"
@@ -34,7 +34,7 @@
             echo "" && 
             echo "" && 
             echo "" && 
-            echo "Downloading request" &&
+            echo "Downloading request:" &&
             
             if java -jar
                 "\$JAVA_JAR_PATH/EgaDemoClient.jar"
@@ -51,23 +51,31 @@
                 echo "" && 
                 echo "" && 
                 echo "" && 
-                echo "Decrpyting \$ENCRYPTED_FILES_NAME to \$DECRYPTED_FILES_NAME" && 
+                echo "Decrpyting \$ENCRYPTED_FILES_NAME to \$DECRYPTED_FILES_NAME:" && 
                 
                 if java -jar
                         "\$JAVA_JAR_PATH/EgaDemoClient.jar"
                         -pf credentials.txt
                         -dc "\$ENCRYPTED_FILES_NAME"
-                        -dck "$encryption_key" ; then
+                        -dck "$encryption_key" > decrypt.log ; then
+                    
+                    cat decrypt.log &&
                     
                     if file --mime-type "\$DECRYPTED_FILES_NAME" | grep -q /gzip\$; then
-                        echo "Unpacking as well" &&
+                    
+                        echo "" && 
+                        echo "" && 
+                        echo "" && 
+                        echo "Unpacking because it is an archive" &&
                         gunzip -cf "\$DECRYPTED_FILES_NAME" > "$output" ;
+                        
                     else
                         mv "\$DECRYPTED_FILES_NAME" "$output" ;
                     fi ;
                     
                 else
                     echo "Error: decrypting failed:" 1>&2 &&
+                    cat decrypt.log &&
                     exit 1 ; 
                 fi ;
             
@@ -78,8 +86,8 @@
             fi ;
         
         else
+            echo "Error: making the request failed" 1>&2 &&
             cat request.log && 
-            echo "Error: making the request failed" 1>&2 &&
             exit 1 ;
         fi &&