jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 06:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6316 from mglae/le11_systools_129

Browse Source 
system-tools: rev 129; Execute "st" only on Generic X11; Set executable flag of 7z/7za
This commit is contained in:
CvH 2022-04-15 19:43:12 +02:00 committed by GitHub
commit 34cb2e65e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/addons/tools/system-tools/changelog.txt
View File

@ -1,3 +1,6 @@
129
- Fix (set) 7z/7za executable flag
128 128
- Add mmc-utils - Add mmc-utils

2
packages/addons/tools/system-tools/package.mk
View File

@ -3,7 +3,7 @@
PKG_NAME="system-tools" PKG_NAME="system-tools"
PKG_VERSION="1.0" PKG_VERSION="1.0"
PKG_REV="128" PKG_REV="129"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv" PKG_SITE="https://libreelec.tv"

4
packages/addons/tools/system-tools/source/bin/7z
View File

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
exec /storage/.kodi/addons/virtual.system-tools/lib/p7zip/7z "$@" file=/storage/.kodi/addons/virtual.system-tools/lib/p7zip/7z
[ ! -x ${file} ] && chmod +x ${file}
exec ${file} "$@"

4
packages/addons/tools/system-tools/source/bin/7za
View File

@ -1,2 +1,4 @@
#!/bin/sh #!/bin/sh
exec /storage/.kodi/addons/virtual.system-tools/lib/p7zip/7za "$@" file=/storage/.kodi/addons/virtual.system-tools/lib/p7zip/7za
[ ! -x ${file} ] && chmod +x ${file}
exec ${file} "$@"

11
packages/addons/tools/system-tools/source/default.py
View File

@ -4,9 +4,16 @@
import xbmcaddon import xbmcaddon
import xbmcgui import xbmcgui
import subprocess import subprocess
import os.path import re
import csv
if os.path.exists(os.path.join(xbmcaddon.Addon().getAddonInfo('path'), 'bin/st')): with open('/etc/os-release') as stream:
contents = stream.read().strip()
vars = re.findall(r"^[a-zA-Z0-9_]+=.*$", contents, flags=re.MULTILINE)
reader = csv.reader(vars, delimiter="=")
osrelease = dict(reader)
if osrelease['LIBREELEC_ARCH'] == 'x11.x86_64' or osrelease['LIBREELEC_ARCH'] == 'Generic-legacy.x86_64':
yes = xbmcgui.Dialog().yesno('System Tools', 'This is a console-only addon.[CR][CR]Open a terminal window?',nolabel='No',yeslabel='Yes') yes = xbmcgui.Dialog().yesno('System Tools', 'This is a console-only addon.[CR][CR]Open a terminal window?',nolabel='No',yeslabel='Yes')
if yes: if yes:
subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec st -e sh -l"], shell=False, close_fds=True) subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec st -e sh -l"], shell=False, close_fds=True)