Update download md5 check logic (#231)

WeBankBlockchain · May 12, 2020 · e0de0cb · e0de0cb
1 parent fbd85f0
commit e0de0cb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/scripts/download_console.sh b/scripts/download_console.sh
@@ -112,7 +112,7 @@ download_release_pkg()
     fi
 
     # download 
-    if [ ! -f "${release_pkg}" ] || [ -z "$(md5sum -c ${release_pkg_checksum_file}|grep OK)" ];then
+    if [ ! -f "${release_pkg}" ] || [ "$(md5sum -c ${release_pkg_checksum_file}|echo $?)" -ne "0" ];then
 
         LOG_INFO "Try to download from: ${cdn_url}/${compatibility_version}/${release_pkg}"
         if ! curl --fail -LO ${cdn_url}/${compatibility_version}/${release_pkg}; then
@@ -121,7 +121,7 @@ download_release_pkg()
             curl -C - -LO ${github_url}/${compatibility_version}/${release_pkg}
         fi
 
-        if [ -z "$(md5sum -c ${release_pkg_checksum_file}|grep OK)" ]; then
+        if [ "$(md5sum -c ${release_pkg_checksum_file}|echo $?)" -ne "0" ]; then
             LOG_ERROR "Download package error"
             rm -f ${release_pkg}
             exit 1

diff --git a/scripts/download_demo.sh b/scripts/download_demo.sh
@@ -96,7 +96,7 @@ download_release_pkg()
     fi
 
     # download 
-    if [ ! -f "${release_pkg}" ] || [ -z "$(md5sum -c ${release_pkg_checksum_file}|grep OK)" ];then
+    if [ ! -f "${release_pkg}" ] || [ "$(md5sum -c ${release_pkg_checksum_file}|echo $?)" -ne "0" ];then
 
         LOG_INFO "Try to download from: ${cdn_url}/${compatibility_version}/${release_pkg}"
         if ! curl --fail -LO ${cdn_url}/${compatibility_version}/${release_pkg}; then
@@ -105,7 +105,7 @@ download_release_pkg()
             curl -C - -LO ${github_url}/${compatibility_version}/${release_pkg}
         fi
 
-        if [ -z "$(md5sum -c ${release_pkg_checksum_file}|grep OK)" ]; then
+        if [ "$(md5sum -c ${release_pkg_checksum_file}|echo $?)" -ne "0" ]; then
             LOG_ERROR "Download package error"
             rm -f ${release_pkg}
             exit 1

diff --git a/scripts/download_wecross.sh b/scripts/download_wecross.sh
@@ -142,7 +142,7 @@ download_release_pkg()
     fi
 
     # download 
-    if [ ! -f "${release_pkg}" ] || [ -z "$(md5sum -c ${release_pkg_checksum_file}|grep OK)" ];then
+    if [ ! -f "${release_pkg}" ] || [ "$(md5sum -c ${release_pkg_checksum_file}|echo $?)" -ne "0" ];then
 
         LOG_INFO "Try to download from: ${cdn_url}/${compatibility_version}/${release_pkg}"
         if ! curl --fail -LO ${cdn_url}/${compatibility_version}/${release_pkg}; then
@@ -151,7 +151,7 @@ download_release_pkg()
             curl -C - -LO ${github_url}/${compatibility_version}/${release_pkg}
         fi
 
-        if [ -z "$(md5sum -c ${release_pkg_checksum_file}|grep OK)" ]; then
+        if [ "$(md5sum -c ${release_pkg_checksum_file}|echo $?)" -ne "0" ]; then
             LOG_ERROR "Download package error"
             rm -f ${release_pkg}
             exit 1