Skip to content

Commit 36db432

Browse files
committed
drive-utils.sh: Fix parameter names for resuming
from contibuting.md Special instructions for posix scripts: - All local variables should have function name at the end. This is because posix doesn't have local variable feature. It is not mandatory but should be followed to avoid conflicts.
1 parent 4b7cbb6 commit 36db432

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

sh/drive-utils.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ _upload_file() {
211211
[ $# -lt 3 ] && printf "Missing arguments\n" && return 1
212212
job_upload_file="${1}" input_upload_file="${2}" folder_id_upload_file="${3}"
213213
unset slug_upload_file inputname_upload_file extension_upload_file inputsize_upload_file readable_size_upload_file request_method_upload_file \
214-
url_upload_file postdata_upload_file uploadlink_upload_file upload_body_upload_file mime_type_upload_file resume_args_upload_file \
215-
description_upload_file
214+
url_upload_file postdata_upload_file uploadlink_upload_file upload_body_upload_file mime_type_upload_file description_upload_file \
215+
resume_args1_upload_file resume_args2_upload_file resume_args3_upload_file
216216

217217
slug_upload_file="${input_upload_file##*/}"
218218
inputname_upload_file="${slug_upload_file%.*}"
@@ -285,7 +285,7 @@ _upload_file() {
285285
content_range_upload_file="$(printf "bytes %s-%s/%s\n" "$((uploaded_range_upload_file + 1))" "$((inputsize_upload_file - 1))" "${inputsize_upload_file}")"
286286
content_length_upload_file="$((inputsize_upload_file - $((uploaded_range_upload_file + 1))))"
287287
# Resuming interrupted uploads needs http1.1
288-
resume_args1='-s' resume_args2='--http1.1' resume_args3="Content-Range: ${content_range_upload_file}"
288+
resume_args1_upload_file='-s' resume_args2_upload_file='--http1.1' resume_args3_upload_file="Content-Range: ${content_range_upload_file}"
289289
_upload_file_from_uri _clear_line
290290
_collect_file_info "${upload_body_upload_file}" "${slug_upload_file}" || return 1
291291
_normal_logging_upload
@@ -346,8 +346,8 @@ _upload_file_from_uri() {
346346
-o- \
347347
--url "${uploadlink_upload_file}" \
348348
--globoff \
349-
${CURL_SPEED} ${resume_args1} ${resume_args2} \
350-
-H "${resume_args3}" || :)"
349+
${CURL_SPEED} ${resume_args1_upload_file} ${resume_args2_upload_file} \
350+
-H "${resume_args3_upload_file}" || :)"
351351
[ -z "${VERBOSE_PROGRESS}" ] && for _ in 1 2; do _clear_line 1; done && "${1:-:}"
352352
return 0
353353
}

sh/release/gupload

+5-5
Original file line numberDiff line numberDiff line change
@@ -1076,8 +1076,8 @@ _upload_file() {
10761076
[ $# -lt 3 ] && printf "Missing arguments\n" && return 1
10771077
job_upload_file="${1}" input_upload_file="${2}" folder_id_upload_file="${3}"
10781078
unset slug_upload_file inputname_upload_file extension_upload_file inputsize_upload_file readable_size_upload_file request_method_upload_file \
1079-
url_upload_file postdata_upload_file uploadlink_upload_file upload_body_upload_file mime_type_upload_file resume_args_upload_file \
1080-
description_upload_file
1079+
url_upload_file postdata_upload_file uploadlink_upload_file upload_body_upload_file mime_type_upload_file description_upload_file \
1080+
resume_args1_upload_file resume_args2_upload_file resume_args3_upload_file
10811081

10821082
slug_upload_file="${input_upload_file##*/}"
10831083
inputname_upload_file="${slug_upload_file%.*}"
@@ -1150,7 +1150,7 @@ _upload_file() {
11501150
content_range_upload_file="$(printf "bytes %s-%s/%s\n" "$((uploaded_range_upload_file + 1))" "$((inputsize_upload_file - 1))" "${inputsize_upload_file}")"
11511151
content_length_upload_file="$((inputsize_upload_file - $((uploaded_range_upload_file + 1))))"
11521152
# Resuming interrupted uploads needs http1.1
1153-
resume_args1='-s' resume_args2='--http1.1' resume_args3="Content-Range: ${content_range_upload_file}"
1153+
resume_args1_upload_file='-s' resume_args2_upload_file='--http1.1' resume_args3_upload_file="Content-Range: ${content_range_upload_file}"
11541154
_upload_file_from_uri _clear_line
11551155
_collect_file_info "${upload_body_upload_file}" "${slug_upload_file}" || return 1
11561156
_normal_logging_upload
@@ -1211,8 +1211,8 @@ _upload_file_from_uri() {
12111211
-o- \
12121212
--url "${uploadlink_upload_file}" \
12131213
--globoff \
1214-
${CURL_SPEED} ${resume_args1} ${resume_args2} \
1215-
-H "${resume_args3}" || :)"
1214+
${CURL_SPEED} ${resume_args1_upload_file} ${resume_args2_upload_file} \
1215+
-H "${resume_args3_upload_file}" || :)"
12161216
[ -z "${VERBOSE_PROGRESS}" ] && for _ in 1 2; do _clear_line 1; done && "${1:-:}"
12171217
return 0
12181218
}

0 commit comments

Comments
 (0)