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 <[email protected]>
openwrt · Nov 3, 2024 · d6d55f5 · d6d55f5
1 parent 5c27cf3
commit d6d55f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
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
@@ -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
@@ -88,6 +88,7 @@ case "$action" in
 			fi
 
 			if flock -x 200; then
+				pkmcmd="$cmd $action $@"
 				$cmd $action "$@" </dev/null >/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