diff --git a/compile_macosx.sh b/compile_macosx.sh index fd6a829..ade331f 100755 --- a/compile_macosx.sh +++ b/compile_macosx.sh @@ -47,6 +47,7 @@ fi #CMake patching python3 ../scripts/patch_cmake.py cmake/DownloadCEF.cmake +python3 ../scripts/patch_cmake.py CMakeLists.txt # Create and enter the `jcef_build` directory. # The `jcef_build` directory name is required by other JCEF tooling diff --git a/scripts/patch_cmake.py b/scripts/patch_cmake.py index e5b7e39..a054b98 100644 --- a/scripts/patch_cmake.py +++ b/scripts/patch_cmake.py @@ -5,15 +5,17 @@ import sys input = sys.argv[1] -print("Patching "+input+" to use spotify for downloads again...") +print("Patching "+input+"...") f = open(input, "r") result = "" for x in f: result += x.replace("https://cache-redirector.jetbrains.com/intellij-jbr/", "https://cef-builds.spotifycdn.com/") \ - .replace("_minimal", "") \ - .replace(".zip", ".tar.bz2") \ - .replace(".checksum", ".sha1") + .replace("_minimal", "") \ + .replace(".zip", ".tar.bz2") \ + .replace(".checksum", ".sha1") \ + .replace("SHA256", "SHA1") \ + .replace("x86_64", "amd64") f.close() diff --git a/scripts/run_linux.sh b/scripts/run_linux.sh index 4f20b95..2a36ef0 100644 --- a/scripts/run_linux.sh +++ b/scripts/run_linux.sh @@ -30,6 +30,7 @@ fi #CMake patching python3 /builder/patch_cmake.py cmake/DownloadCEF.cmake +python3 /builder/patch_cmake.py CMakeLists.txt # Create and enter the `jcef_build` directory. # The `jcef_build` directory name is required by other JCEF tooling diff --git a/scripts/run_linux_prebuild.sh b/scripts/run_linux_prebuild.sh index e014b77..017b4f1 100644 --- a/scripts/run_linux_prebuild.sh +++ b/scripts/run_linux_prebuild.sh @@ -27,6 +27,7 @@ fi #CMake patching python3 /builder/patch_cmake.py cmake/DownloadCEF.cmake +python3 /builder/patch_cmake.py CMakeLists.txt # Create and enter the `jcef_build` directory. # The `jcef_build` directory name is required by other JCEF tooling