mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Restore workaround for -C in mar command

Browse source
This commit is contained in:
Dan Stillman 2023-05-18 04:59:37 +01:00
parent cc65ca032e
commit 39fa35ae12
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/update-packaging/make_full_update.sh
View file

@ -112,8 +112,11 @@ append_remove_instructions "$targetdir" "$updatemanifestv3"
$XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force "$updatemanifestv3" && mv -f "$updatemanifestv3.xz" "$updatemanifestv3" $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force "$updatemanifestv3" && mv -f "$updatemanifestv3.xz" "$updatemanifestv3"
mar_command="$mar_command -C \"$workdir\" -c output.mar" # Changed for Zotero -- -C is unreliable
pushd "$workdir" > /dev/null
mar_command="$mar_command -c output.mar"
eval "$mar_command $targetfiles" eval "$mar_command $targetfiles"
popd > /dev/null
mv -f "$workdir/output.mar" "$archive" mv -f "$workdir/output.mar" "$archive"
# cleanup # cleanup

5
app/update-packaging/make_incremental_update.sh
View file

@ -312,8 +312,11 @@ done
$XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force "$updatemanifestv3" && mv -f "$updatemanifestv3.xz" "$updatemanifestv3" $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force "$updatemanifestv3" && mv -f "$updatemanifestv3.xz" "$updatemanifestv3"
mar_command="$mar_command -C \"$workdir\" -c output.mar" # Changed for Zotero -- -C is unreliable
pushd "$workdir" > /dev/null
mar_command="$mar_command -c output.mar"
eval "$mar_command $archivefiles" eval "$mar_command $archivefiles"
popd > /dev/null
mv -f "$workdir/output.mar" "$archive" mv -f "$workdir/output.mar" "$archive"
# cleanup # cleanup