TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-27 06:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use jq to clean whitespace/quotes

Browse Source 
It seems that older jq versions choke on some output from curl inside
these scripts. But I couldn't reproduce this on the cmdline; so not
really sure what's going on, suspecting some settings in the bash
script. Tested this with jq-1.5 and jq-1.6, both worked. But since
`xargs` also trims a string from quotes and whitespace, it can be used
instead of jq in these places.
This commit is contained in:
Eike Kettner
2021-05-28 21:57:30 +02:00
committed by eikek
parent 045d0a4fc3
commit 1d7a2bc9d5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/download-files/download-files.sh
View File

@ -150,7 +150,7 @@ downloadAttachment() {
DL_URL="$ATTACH_URL/$attachId"
checksum1=$("$CURL_CMD" -s -I -H "X-Docspell-Auth: $auth_token" "$DL_URL" | \
grep -i 'etag' | cut -d' ' -f2 | "$JQ_CMD" -r)
grep -i 'etag' | cut -d' ' -f2 | xargs | tr -d '\r')
"$CURL_CMD" -s -o "$attachOut" -H "X-Docspell-Auth: $auth_token" "$DL_URL"
checksum2=$(sha256sum "$attachOut" | cut -d' ' -f1 | xargs)
if [ "$checksum1" == "$checksum2" ]; then

6
tools/export-files/export-files.sh
View File

@ -178,7 +178,7 @@ downloadAttachment() {
fi
checksum1=$("$CURL_CMD" -s -I -H "X-Docspell-Auth: $auth_token" "$ATTACH_URL/$attachId/original" | \
grep -i 'etag' | cut -d' ' -f2 | "$JQ_CMD" -r)
grep -i 'etag' | cut -d':' -f2 | xargs | tr -d '\r')
"$CURL_CMD" -s -o "$attachOut" -H "X-Docspell-Auth: $auth_token" "$ATTACH_URL/$attachId/original"
checksum2=$(sha256sum "$attachOut" | cut -d' ' -f1 | xargs)
if [ "$checksum1" == "$checksum2" ]; then
@ -212,15 +212,13 @@ downloadItem() {
errout " - Removing metadata.json as requested"
rm -f "$out/metadata.json"
fi
echo $itemData | "$JQ_CMD" > "$out/metadata.json"
echo $itemData > "$out/metadata.json"
fi
while read attachId attachName; do
attachOut="$out/$attachName"
checkLogin
downloadAttachment "$attachId"
done < <(echo $itemData | "$JQ_CMD" -r '.sources[] | [.id,.name] | join(" ")')
}
login