diff --git a/browser_patches/chromium/archive.sh b/browser_patches/chromium/archive.sh index 6178349d2d..7df0055e6d 100755 --- a/browser_patches/chromium/archive.sh +++ b/browser_patches/chromium/archive.sh @@ -59,12 +59,15 @@ function archive_compiled_chromium() { CHROMIUM_FOLDER_NAME="chrome-linux" # Run python script and convert output to array. IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/linux/FILES.cfg")) + unset IFS elif [[ $1 == "--compile-win32" ]]; then CHROMIUM_FOLDER_NAME="chrome-win" - IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 32bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg")) + IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 32bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg")) + unset IFS elif [[ $1 == "--compile-win64" ]]; then CHROMIUM_FOLDER_NAME="chrome-win" - IFS=$'\n' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg")) + IFS=$'\n\r' CHROMIUM_FILES_TO_ARCHIVE=($("${SCRIPT_PATH}/compute_files_to_archive.py" 64bit "${CR_CHECKOUT_PATH}/src/chrome/tools/build/win/FILES.cfg")) + unset IFS else echo "ERROR: unknown command, use --help for details" exit 1 diff --git a/browser_patches/chromium/compute_files_to_archive.py b/browser_patches/chromium/compute_files_to_archive.py index 2d7663d7da..1cb80cc51d 100755 --- a/browser_patches/chromium/compute_files_to_archive.py +++ b/browser_patches/chromium/compute_files_to_archive.py @@ -4,15 +4,15 @@ import sys import json if len(sys.argv) < 2: - print "ERROR: expected arch: 32bit or 64bit" + print("ERROR: expected arch: 32bit or 64bit") sys.exit(1) if str(sys.argv[1]) == "--help" or str(sys.argv[1]) == "-h": - print "Usage: read_files.py [32bit|64bit] " + print("Usage: read_files.py [32bit|64bit] ") sys.exit(1) if len(sys.argv) < 3: - print "ERROR: expected FILE.cfg path" + print("ERROR: expected FILE.cfg path") sys.exit(1) exclude_list = [