From 4fc634f6bce2ad9260072011a4e8a006f984ac4e Mon Sep 17 00:00:00 2001 From: mglae Date: Fri, 25 Dec 2020 16:15:10 +0100 Subject: [PATCH] system-tools: add st --- packages/addons/tools/system-tools/package.mk | 5 ++++- packages/addons/tools/system-tools/source/default.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index ebc7aef6e2..3dfe7de085 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -52,7 +52,7 @@ PKG_DEPENDS_TARGET="toolchain \ ytop" if [ "$TARGET_ARCH" = "x86_64" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr st" fi addon() { @@ -146,6 +146,9 @@ addon() { # smartmontools cp -P $(get_install_dir smartmontools)/usr/sbin/smartctl $ADDON_BUILD/$PKG_ADDON_ID/bin + # st + cp -P $(get_build_dir st)/st $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || : + # strace cp -P $(get_install_dir strace)/usr/bin/strace $ADDON_BUILD/$PKG_ADDON_ID/bin diff --git a/packages/addons/tools/system-tools/source/default.py b/packages/addons/tools/system-tools/source/default.py index f6891701ed..a9ca956181 100644 --- a/packages/addons/tools/system-tools/source/default.py +++ b/packages/addons/tools/system-tools/source/default.py @@ -1,10 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) +import xbmcaddon import xbmcgui import subprocess +import os.path -yes = xbmcgui.Dialog().yesno('', 'This is a console-only addon','','Open a terminal window?','No','Yes') -if yes: - subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec mrxvt -ls"], shell=False, close_fds=True) - +if os.path.exists(os.path.join(xbmcaddon.Addon().getAddonInfo('path'), 'bin/st')): + yes = xbmcgui.Dialog().yesno('System Tools', 'This is a console-only addon.[CR][CR]Open a terminal window?',nolabel='No',yeslabel='Yes') + if yes: + subprocess.Popen(["systemd-run","sh","-c",". /etc/profile;cd;exec st -e sh -l"], shell=False, close_fds=True) +else: + xbmcgui.Dialog().ok('System Tools', 'This is a console-only addon')