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

Improve build scripts to work in pathnames with spaces

Browse source
This commit is contained in:
Adomas Venčkauskas 2023-07-05 15:01:32 +03:00
parent 04496fadcd
commit 49eda8861e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.sh
View file

@ -136,12 +136,12 @@ function check_xulrunner_hash {
echo echo
$CALLDIR/scripts/fetch_xulrunner -p $platform $CALLDIR/scripts/fetch_xulrunner -p $platform
else else
recalculated_xulrunner_hash=$($CALLDIR/scripts/xulrunner_hash -p $platform) recalculated_xulrunner_hash=$("$CALLDIR/scripts/xulrunner_hash" -p $platform)
current_xulrunner_hash=$(< "$CALLDIR/xulrunner/$platform_hash_file") current_xulrunner_hash=$(< "$CALLDIR/xulrunner/$platform_hash_file")
if [ "$current_xulrunner_hash" != "$recalculated_xulrunner_hash" ]; then if [ "$current_xulrunner_hash" != "$recalculated_xulrunner_hash" ]; then
echo "xulrunner hashes don't match -- redownloading" echo "xulrunner hashes don't match -- redownloading"
echo echo
$CALLDIR/scripts/fetch_xulrunner -p $platform "$CALLDIR/scripts/fetch_xulrunner" -p $platform
current_xulrunner_hash=$(< "$CALLDIR/xulrunner/$platform_hash_file") current_xulrunner_hash=$(< "$CALLDIR/xulrunner/$platform_hash_file")
if [ "$current_xulrunner_hash" != "$recalculated_xulrunner_hash" ]; then if [ "$current_xulrunner_hash" != "$recalculated_xulrunner_hash" ]; then
echo "xulrunner hashes don't match after running fetch_xulrunner!" echo "xulrunner hashes don't match after running fetch_xulrunner!"

4
app/scripts/fetch_xulrunner
View file

@ -387,7 +387,7 @@ if [ $BUILD_MAC == 1 ]; then
#if [ ! -e "Firefox $GECKO_VERSION MacOS.zip" ]; then #if [ ! -e "Firefox $GECKO_VERSION MacOS.zip" ]; then
# rm "MacOS.zip" # rm "MacOS.zip"
#fi #fi
echo $($SCRIPT_DIR/xulrunner_hash -p m) > hash-mac echo $("$SCRIPT_DIR/xulrunner_hash" -p m) > hash-mac
fi fi
if [ $BUILD_WIN == 1 ]; then if [ $BUILD_WIN == 1 ]; then
@ -452,7 +452,7 @@ if [ $BUILD_WIN == 1 ]; then
echo echo
echo echo
done done
echo $($SCRIPT_DIR/xulrunner_hash -p w) > hash-win echo $("$SCRIPT_DIR/xulrunner_hash" -p w) > hash-win
fi fi
if [ $BUILD_LINUX == 1 ]; then if [ $BUILD_LINUX == 1 ]; then

2
app/scripts/xulrunner_hash
View file

@ -36,7 +36,7 @@ else
fi fi
xulrunner_content=$(< "$SCRIPT_DIR/fetch_xulrunner") xulrunner_content=$(< "$SCRIPT_DIR/fetch_xulrunner")
xulrunner_gecko_hash=$(echo -n "$GECKO_VERSION - $xulrunner_content" | openssl dgst -sha256) xulrunner_gecko_hash=$(echo -n "$GECKO_VERSION - '$xulrunner_content'" | openssl dgst -sha256)
echo "$xulrunner_gecko_hash" echo "$xulrunner_gecko_hash"