diff --git a/app/build.sh b/app/build.sh index 472f2f05ce..03efe8d992 100755 --- a/app/build.sh +++ b/app/build.sh @@ -136,12 +136,12 @@ function check_xulrunner_hash { echo $CALLDIR/scripts/fetch_xulrunner -p $platform 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") if [ "$current_xulrunner_hash" != "$recalculated_xulrunner_hash" ]; then echo "xulrunner hashes don't match -- redownloading" echo - $CALLDIR/scripts/fetch_xulrunner -p $platform + "$CALLDIR/scripts/fetch_xulrunner" -p $platform current_xulrunner_hash=$(< "$CALLDIR/xulrunner/$platform_hash_file") if [ "$current_xulrunner_hash" != "$recalculated_xulrunner_hash" ]; then echo "xulrunner hashes don't match after running fetch_xulrunner!" diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner index cc31f90d9d..fe64e6b945 100755 --- a/app/scripts/fetch_xulrunner +++ b/app/scripts/fetch_xulrunner @@ -387,7 +387,7 @@ if [ $BUILD_MAC == 1 ]; then #if [ ! -e "Firefox $GECKO_VERSION MacOS.zip" ]; then # rm "MacOS.zip" #fi - echo $($SCRIPT_DIR/xulrunner_hash -p m) > hash-mac + echo $("$SCRIPT_DIR/xulrunner_hash" -p m) > hash-mac fi if [ $BUILD_WIN == 1 ]; then @@ -452,7 +452,7 @@ if [ $BUILD_WIN == 1 ]; then echo echo done - echo $($SCRIPT_DIR/xulrunner_hash -p w) > hash-win + echo $("$SCRIPT_DIR/xulrunner_hash" -p w) > hash-win fi if [ $BUILD_LINUX == 1 ]; then diff --git a/app/scripts/xulrunner_hash b/app/scripts/xulrunner_hash index dd9149beea..04e7e1de3a 100755 --- a/app/scripts/xulrunner_hash +++ b/app/scripts/xulrunner_hash @@ -36,7 +36,7 @@ else fi 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"