diff options
Diffstat (limited to 'applications/luci-app-package-manager')
| -rw-r--r-- | applications/luci-app-package-manager/htdocs/luci-static/resources/view/package-manager.js | 3 | ||||
| -rwxr-xr-x | applications/luci-app-package-manager/root/usr/libexec/package-manager-call | 2 |
2 files changed, 5 insertions, 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 index bc246f9e29..380ee76d82 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 7667b8e8ce..0fe6efd16b 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 "$@" </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 |