# HG changeset patch
# User yhoogstrate
# Date 1459250660 14400
# Node ID 4be485e480651e342ad3591a8b77fde4e39220e5
# Parent  8af9d199e41052e5f1daa2cf615d2ef33fd09ac6
planemo upload for repository https://github.com/ErasmusMC-Bioinformatics/ega_client_galaxy_wrapper commit 63cc1d3eba84a01ae7e9da734ed91f5b531e4a91-dirty

diff -r 8af9d199e410 -r 4be485e48065 ega_download_streamer.xml
--- a/ega_download_streamer.xml	Tue Mar 29 06:56:26 2016 -0400
+++ b/ega_download_streamer.xml	Tue Mar 29 07:24:20 2016 -0400
@@ -22,45 +22,65 @@
         echo \$pass >> credentials.txt &&
         
         echo "Creating an encryption request at server" && 
-        java -jar
+        
+        if java -jar
             "\$JAVA_JAR_PATH/EgaDemoClient.jar"
             -pf "credentials.txt"
             -rf "$ega_file_identifier"
             -re "$encryption_key"
-            -label "${random_request_uid}" | grep -v "Login failed" && 
-        
-        echo "" && 
-        echo "" && 
-        echo "" && 
-        echo "Downloading request" && 
-        java -jar
-            "\$JAVA_JAR_PATH/EgaDemoClient.jar"
-            -pf "credentials.txt"
-            -dr "${random_request_uid}"
-            -nt 7 > download.log ;
+            -label "${random_request_uid}" | grep -v "Login failed" ; then
+            
+            echo "" && 
+            echo "" && 
+            echo "" && 
+            echo "Downloading request" &&
+            
+            if java -jar
+                "\$JAVA_JAR_PATH/EgaDemoClient.jar"
+                -pf "credentials.txt"
+                -dr "${random_request_uid}"
+                -nt 7 > download.log ; then
+                
+                cat download.log &&
+                
+                ## Commands below may fail if authentication was not a success
+                ENCRYPTED_FILES_NAME=\$(grep -oE "Completed Download Target:[ ]+(.*?)\.cip" download.log | sed -r "s/^Completed Download Target:[ ]+//" ) && 
+                DECRYPTED_FILES_NAME=\${ENCRYPTED_FILES_NAME%.cip} && 
+                
+                echo "" && 
+                echo "" && 
+                echo "" && 
+                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
+                    
+                    if file --mime-type "\$DECRYPTED_FILES_NAME" | grep -q /gzip\$; then
+                        echo "Unpacking as well" &&
+                        gunzip -cf "\$DECRYPTED_FILES_NAME" > "$output" ;
+                    else
+                        mv "\$DECRYPTED_FILES_NAME" "$output" ;
+                    fi ;
+                    
+                else
+                    echo "Error: decrypting failed:" 1>&2 &&
+                    exit 1 ; 
+                fi ;
+            
+            else
+                echo "Error: downloading the request failed:" 1>&2 &&
+                cat download.log &&
+                exit 1 ; 
+            fi ;
         
-        cat download.log &&
-         
-        ## Commands below may fail if authentication was not a success
-        ENCRYPTED_FILES_NAME=\$(grep -oE "Completed Download Target:[ ]+(.*?)\.cip" download.log | sed -r "s/^Completed Download Target:[ ]+//" ) && 
-        DECRYPTED_FILES_NAME=\${ENCRYPTED_FILES_NAME%.cip} && 
+        else
+            echo "Error: making the request failed" 1>&2 &&
+            exit 1 ;
+        fi &&
         
-        echo "" && 
-        echo "" && 
-        echo "" && 
-        echo "Decrpyting \$ENCRYPTED_FILES_NAME to \$DECRYPTED_FILES_NAME" && 
-        java -jar
-            "\$JAVA_JAR_PATH/EgaDemoClient.jar"
-            -pf credentials.txt
-            -dc "\$ENCRYPTED_FILES_NAME"
-            -dck "$encryption_key" &&
-        
-        if file --mime-type "\$DECRYPTED_FILES_NAME" | grep -q /gzip$; then
-            echo "Unpacking as well" &&
-            gunzip -cf "\$DECRYPTED_FILES_NAME" > "$output" ;
-        else
-            mv "\$DECRYPTED_FILES_NAME" "$output" ;
-        fi ;
         
         echo "Cleaning up credentials" && 
         echo "overwriten" > "credentials.txt" &&