From de67ea0a84f7277f97d340a4ef636f72d3bd72c2 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 29 Jun 2024 19:27:50 -0400 Subject: [PATCH] chrome: conditionally extract deb file Signed-off-by: Ian Leonard --- packages/addons/browser/chrome/package.mk | 2 +- .../chrome/source/bin/deb_extract_data | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 043c18ed21..6315307426 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -5,7 +5,7 @@ PKG_NAME="chrome" PKG_VERSION="1.0" # curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version PKG_VERSION_NUMBER="123.0.6312.122" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="Custom" PKG_SITE="http://www.google.com/chrome" diff --git a/packages/addons/browser/chrome/source/bin/deb_extract_data b/packages/addons/browser/chrome/source/bin/deb_extract_data index 9e792cdeeb..b1e1348d69 100755 --- a/packages/addons/browser/chrome/source/bin/deb_extract_data +++ b/packages/addons/browser/chrome/source/bin/deb_extract_data @@ -3,16 +3,28 @@ # SPDX-License-Identifier: GPL-2.0-only # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) +import os import sys + sys.path.append('/storage/.kodi/addons/browser.chrome/resources') import unix_ar import tarfile + if len(sys.argv) != 3: print("Parameter error", file=sys.stderr) sys.exit(1) -ar = unix_ar.open(sys.argv[1]) -tarball = ar.open('data.tar.xz/') -tar = tarfile.open(fileobj=tarball) -tar.extractall(path=sys.argv[2]) +if os.path.isfile(sys.argv[1]): + try: + ar = unix_ar.open(sys.argv[1]) + except ValueError: + print(f"Unable to open archive: {sys.argv[1]}", file=sys.stderr) + sys.exit(1) + else: + tarball = ar.open('data.tar.xz/') + tar = tarfile.open(fileobj=tarball) + tar.extractall(path=sys.argv[2]) +else: + print(f"File not found: {sys.argv[1]}", file=sys.stderr) + sys.exit(1)