summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbcattaneo <c@ttaneo.uy>2020-07-12 18:01:26 -0300
committerRasmus Thomsen <oss@cogitri.dev>2020-07-31 23:54:32 +0200
commit3f89d021981bd98364635329057ec6d94aa8de36 (patch)
tree757ebed708eb710e3447fd76f89b0831eb2e00bc
parenta21328eb40b108223e8d9e4ac8b705fe9069fcf2 (diff)
downloadwgetpaste-3f89d021981bd98364635329057ec6d94aa8de36.tar.gz
Use a new array for all additional headers
-rwxr-xr-xwgetpaste20
1 files changed, 12 insertions, 8 deletions
diff --git a/wgetpaste b/wgetpaste
index 960a2b9..f612a4b 100755
--- a/wgetpaste
+++ b/wgetpaste
@@ -39,7 +39,7 @@ REGEX_RAW_tinyurl='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2|'
# snippets
ENGINE_snippets=snippets
URL_snippets="https://gitlab.com/api/v4/snippets"
-SECOND_HEADER_snippets="Content-Type: application/json"
+ADDITIONAL_HEADERS_snippets=("Content-Type: application/json")
### engines
# codepad
@@ -940,19 +940,23 @@ else
WGETEXTRAHEADER=""
fi
- second_header="SECOND_HEADER_$SERVICE"
- if [[ -n "${!second_header}" ]]; then
- WGETSECONDEXTRAHEADER="--header=${!second_header}"
- else
- WGETSECONDEXTRAHEADER=""
+ # build additional headers
+ additional_headers="ADDITIONAL_HEADERS_$SERVICE"
+ WGETADDITIONALHEADERS=()
+ if [[ -n "${!additional_headers}" ]]; then
+ tmp=$additional_headers[@]
+ for i in "${!tmp}"
+ do
+ WGETADDITIONALHEADERS+=("--header=${i}")
+ done
fi
# paste it
WGETARGS="--tries=5 --timeout=60 $WGETARGS"
if geturl needstdout ; then
- OUTPUT=$(LC_ALL=C wget -O - $WGETARGS ${WGETEXTRAHEADER:+"$WGETEXTRAHEADER"} ${WGETSECONDEXTRAHEADER:+"$WGETSECONDEXTRAHEADER"} $RECIPIENT 2>&1)
+ OUTPUT=$(LC_ALL=C wget -O - $WGETARGS ${WGETEXTRAHEADER:+"$WGETEXTRAHEADER"} ${WGETADDITIONALHEADERS[@]:+"${WGETADDITIONALHEADERS[@]}"} $RECIPIENT 2>&1)
else
- OUTPUT=$(LC_ALL=C wget -O /dev/null $WGETARGS ${WGETEXTRAHEADER:+"$WGETEXTRAHEADER"} ${WGETSECONDEXTRAHEADER:+"$WGETSECONDEXTRAHEADER"} $RECIPIENT 2>&1)
+ OUTPUT=$(LC_ALL=C wget -O /dev/null $WGETARGS ${WGETEXTRAHEADER:+"$WGETEXTRAHEADER"} ${WGETADDITIONALHEADERS[@]:+"${WGETADDITIONALHEADERS[@]}"} $RECIPIENT 2>&1)
fi
# clean temporary file if it was created