Merge pull request #12 from hortonworks/fix-poller

Update pollprogress
hortonworks · Aug 31, 2017 · d374c3c · d374c3c
2 parents 9980175 + 3f2bcfb
commit d374c3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ RUN cd /azure && npm install
 ADD ./cli_tools /bin/
 ADD ./azure-copy /bin/
 
-RUN curl -L https://github.com/hortonworks/pollprogress/releases/download/v0.1.0/pollprogress_0.1.0_Linux_x86_64.tgz | tar -xz -C /bin
+RUN curl -Lsf https://github.com/hortonworks/pollprogress/releases/download/v0.1.1/pollprogress_0.1.1_Linux_x86_64.tgz | tar -xz -C /bin
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/azure/bin
 
 ENTRYPOINT ["/bin/cli_tools"]
diff --git a/azure-copy b/azure-copy
@@ -69,7 +69,7 @@ azure_blob_copy() {
         --dest-blob $dest_blob \
         --json 1>&2
 
-    local checkCmd="azure storage blob copy show -a $dest_account -k $dest_key --container $dest_container --blob $dest_blob --json | tee -a azure-copy-progress.json | jq 'if .copy.progress then .copy.progress elif .copyProgress then .copyProgress else \"42/42\" end' -r"
+    local checkCmd="azure storage blob copy show -a $dest_account -k $dest_key --container $dest_container --blob $dest_blob --json | tee -a azure-copy-progress.json | jq -r .copy.progress"
     debug "===> CHECK PROGRESS: $checkCmd"
     echo "$dest_account: $checkCmd"
 }
@@ -86,7 +86,7 @@ _azure_get_account_key() {
         group=$(_azure_get_account_group ${storage})
     fi
 
-    azure storage account keys list -g $group $storage --json | jq -r .[].value | head -1
+    azure storage account keys list -g $group $storage --json | jq -r .[0].value
 }
 
 azure_latest_vhd_by_prefix() {