system-tools: migrate from p7zip to 7-zip and addon (2)

packages/addons/tools/system-tools/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="system-tools"
 PKG_VERSION="1.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -11,13 +11,14 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of system tools and programs"
-PKG_LONGDESC="This bundle currently includes autossh, bottom, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, libgpiod, lm_sensors, lshw, mc, mmc-utils, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, stress-ng, unrar, usb-modeswitch and vim."
+PKG_LONGDESC="This bundle currently includes 7-zip, autossh, bottom, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, libgpiod, lm_sensors, lshw, mc, mmc-utils, mtpfs, nmon, patch, pv, screen, smartmontools, stress-ng, unrar, usb-modeswitch and vim."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="System Tools"
 PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_DEPENDS_TARGET="toolchain \
+                    7-zip \
                     autossh \
                     bottom \
                     diffutils \
@@ -42,7 +43,6 @@ PKG_DEPENDS_TARGET="toolchain \
                     mmc-utils \
                     mtpfs \
                     nmon \
-                    p7zip \
                     patch \
                     pv \
                     screen \
@@ -60,6 +60,9 @@ fi
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,data,lib}
 
+    # 7-zip
+    cp -P $(get_install_dir 7-zip)/usr/bin/7zz ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+
     # autossh
     cp -P $(get_install_dir autossh)/usr/bin/autossh ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
@@ -148,11 +151,6 @@ addon() {
     # nmon
     cp -P $(get_install_dir nmon)/usr/bin/nmon ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
 
-    # p7zip
-    mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip
-    cp -P $(get_install_dir p7zip)/usr/bin/{7z,7za,7z.so} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip
-    cp -PR $(get_install_dir p7zip)/usr/bin/Codecs ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip
-
     # patch
     cp -P $(get_install_dir patch)/usr/bin/patch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 

packages/addons/tools/system-tools/source/bin/7z

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

packages/addons/tools/system-tools/source/bin/7za

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