gupload: _cleanup_config: Don't try to parse empty lines

will lead to _cleanup of whole config if access token expiry is missing
labbots · Nov 11, 2020 · 28cd628 · 28cd628
1 parent a4f47f3
commit 28cd628
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bash/release/gupload b/bash/release/gupload
@@ -1016,7 +1016,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line; do
+    while read -r line && [[ -n ${line} ]]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"
 

diff --git a/bash/upload.bash b/bash/upload.bash
@@ -76,7 +76,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line; do
+    while read -r line && [[ -n ${line} ]]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"
 

diff --git a/sh/release/gupload b/sh/release/gupload
@@ -1003,7 +1003,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line <&4; do
+    while read -r line <&4 && [ -n "${line}" ]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"
 

diff --git a/sh/upload.sh b/sh/upload.sh
@@ -77,7 +77,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line <&4; do
+    while read -r line <&4 && [ -n "${line}" ]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"