From d90728d2c05da46fe5c2a1a1100a93f9a55730d7 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 3 Nov 2024 16:19:15 +0200 Subject: [PATCH] luci-app-package-manager: Show the executed command Clarify the output of the LuCI package manager actions: show also the exact command passed to apk & opkg (in addition to output & errors from the command) Signed-off-by: Hannu Nyman --- .../htdocs/luci-static/resources/view/package-manager.js | 3 +++ .../root/usr/libexec/package-manager-call | 2 ++ 2 files changed, 5 insertions(+) diff --git a/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js b/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js index bc246f9e294..380ee76d824 100644 --- a/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js +++ b/applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js @@ -1021,6 +1021,9 @@ function handlePkg(ev) fs.exec_direct('/usr/libexec/package-manager-call', argv, 'json').then(function(res) { dlg.removeChild(dlg.lastChild); + if (res.pkmcmd) + dlg.appendChild(E('pre', [ res.pkmcmd ])); + if (res.stdout) dlg.appendChild(E('pre', [ res.stdout ])); diff --git a/applications/luci-app-package-manager/root/usr/libexec/package-manager-call b/applications/luci-app-package-manager/root/usr/libexec/package-manager-call index 7667b8e8ce5..0fe6efd16b0 100755 --- a/applications/luci-app-package-manager/root/usr/libexec/package-manager-call +++ b/applications/luci-app-package-manager/root/usr/libexec/package-manager-call @@ -88,6 +88,7 @@ case "$action" in fi if flock -x 200; then + pkmcmd="$cmd $action $@" $cmd $action "$@" /tmp/ipkg.out 2>/tmp/ipkg.err code=$? stdout=$(cat /tmp/ipkg.out) @@ -99,6 +100,7 @@ case "$action" in json_init json_add_int code $code + [ -n "$pkmcmd" ] && json_add_string pkmcmd "$pkmcmd" [ -n "$stdout" ] && json_add_string stdout "$stdout" [ -n "$stderr" ] && json_add_string stderr "$stderr" json_dump