github/FlareSolverr
1
1
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2025-06-09 04:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Chromium exec permissions in Linux package

Browse Source
This commit is contained in:
ngosang 2023-05-21 21:09:06 +02:00
parent ab0fe58d4a
commit 66b9db21e5
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/build_package.py
View File

@ -50,7 +50,20 @@ def download_chromium():
with zipfile.ZipFile(dl_path_zip, 'r') as zip_ref: with zipfile.ZipFile(dl_path_zip, 'r') as zip_ref:
zip_ref.extractall(dl_path) zip_ref.extractall(dl_path)
os.remove(dl_path_zip) os.remove(dl_path_zip)
shutil.move(dl_path_folder, os.path.join(dl_path, "chrome"))
chrome_path = os.path.join(dl_path, "chrome")
shutil.move(dl_path_folder, chrome_path)
print("Extracted in: " + chrome_path)
if os.name != 'nt':
# Give executable permissions for *nix
# file * | grep executable | cut -d: -f1
print("Giving executable permissions...")
execs = ['chrome', 'chrome_crashpad_handler', 'chrome_sandbox', 'chrome-wrapper', 'nacl_helper',
'nacl_helper_bootstrap', 'nacl_irt_x86_64.nexe', 'xdg-mime', 'xdg-settings']
for exec_file in execs:
exec_path = os.path.join(chrome_path, exec_file)
os.chmod(exec_path, 0o755)
def run_pyinstaller(): def run_pyinstaller():

7
src/utils.py
View File

@ -106,12 +106,15 @@ def get_chrome_exe_path() -> str:
return CHROME_EXE_PATH return CHROME_EXE_PATH
# linux pyinstaller bundle # linux pyinstaller bundle
chrome_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'chrome', "chrome") chrome_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'chrome', "chrome")
if os.path.exists(chrome_path) and os.access(chrome_path, os.X_OK): if os.path.exists(chrome_path):
if not os.access(chrome_path, os.X_OK):
raise Exception(f'Chrome binary "{chrome_path}" is not executable. '
f'Please, extract the archive with "tar xzf <file.tar.gz>".')
CHROME_EXE_PATH = chrome_path CHROME_EXE_PATH = chrome_path
return CHROME_EXE_PATH return CHROME_EXE_PATH
# windows pyinstaller bundle # windows pyinstaller bundle
chrome_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'chrome', "chrome.exe") chrome_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'chrome', "chrome.exe")
if os.path.exists(chrome_path) and os.access(chrome_path, os.X_OK): if os.path.exists(chrome_path):
CHROME_EXE_PATH = chrome_path CHROME_EXE_PATH = chrome_path
return CHROME_EXE_PATH return CHROME_EXE_PATH
# system # system