From 3b3c4fdfc95f167e9e8c558bf79b84946d302e9f Mon Sep 17 00:00:00 2001 From: tosu Date: Mon, 6 Mar 2023 00:01:37 +0100 Subject: [PATCH] Error handling, -- refactor, comments, etc. --- downloadBash.sh | 5 +---- downloadPOSIX.sh | 8 +++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/downloadBash.sh b/downloadBash.sh index d6cdd9d..2a69ea8 100755 --- a/downloadBash.sh +++ b/downloadBash.sh @@ -38,10 +38,7 @@ $filter= api-version=1.4-private EOM -API_URL="$( - sed 's/{SPACE}/ /g' <<< "${API_URL}" | - tr -d '\n' -)" +API_URL="$(tr -d -- '\n' <<< "${API_URL//\{SPACE\}/ }")" mkdir -p "${OUTDIR}" || { printf '\033[31m%s\033[m\n' 'Aborting' diff --git a/downloadPOSIX.sh b/downloadPOSIX.sh index 346cad4..d7917f6 100755 --- a/downloadPOSIX.sh +++ b/downloadPOSIX.sh @@ -1,4 +1,6 @@ #!/bin/sh +# Don't link mrsh to sh, since it does not allow line continuations +# in here-documents. Use dash, yash, bash, posh, ksh, mksh, zsh, pbosh # Run entire script in subshell to prevent variable pollution ( @@ -17,7 +19,7 @@ IFS=" " POSIXLY_CORRECT='1' COMMANDS_='builtin unalias unset read printf command exit type . tr mkdir wc sed grep xargs ffmpeg jq wget' -\unset -f -- ${COMMANDS_} +\unset -f -- ${COMMANDS_} 2>/dev/null \unalias -- ${COMMANDS_} 2>/dev/null || true command -v -- wget >/dev/null 2>&1 || { @@ -45,7 +47,7 @@ OUTDIR='./videos' read -r API_URL <<- EOM https://euwe-1.api.microsoftstream.com/api/videos?\ -\$top=100\ +\$top=3\ &\ \$skip=0\ &\ @@ -75,7 +77,7 @@ EOM API_URL="$( printf '%s' "${API_URL}" | - tr -d '\t' + tr -d -- '\t' )" mkdir -p -- "${OUTDIR}" || {