# HG changeset patch # User Pascal Bellard # Date 1428337266 -7200 # Node ID 7a731e6f61a6ea4b9d6fcc0a72fc92b5347c5c77 # Parent 5a6155d9197a5a34d0743cec1d8ca4d1dde344bd pkgs.cgi: non root support diff -r 5a6155d9197a -r 7a731e6f61a6 Makefile --- a/Makefile Fri Apr 03 15:51:06 2015 +0300 +++ b/Makefile Mon Apr 06 18:21:06 2015 +0200 @@ -22,7 +22,7 @@ --package-name=TazPkg \ --package-version="$(VERSION)" -kaction -ktitle -k_ -k_n -k_p:1,2 \ ./tazpkg ./modules/tazpkg-convert ./modules/tazpkg-find-depends ./tazpkg-box \ - ./tazpanel/pkgs ./tazpanel/pkgs.cgi ./tazpkg-notify + ./tazpanel/pkgs.cgi ./tazpkg-notify msgmerge: @for l in $(LINGUAS); do \ @@ -70,7 +70,7 @@ # TazPanel files install -m 0755 -d $(DESTDIR)/var/www/tazpanel/menu.d cp -a tazpanel/pkgs.cgi $(DESTDIR)/var/www/tazpanel - cp -a tazpanel/pkgs $(DESTDIR)/var/www/tazpanel/menu.d + ln -s ../pkgs.cgi $(DESTDIR)/var/www/tazpanel/menu.d/pkgs install -m 0755 -d $(DESTDIR)/var/www/tazpanel/styles/default cp -a tazpanel/pkgs.css $(DESTDIR)/var/www/tazpanel/styles/default install -m 0755 -d $(DESTDIR)/var/www/tazpanel/styles/default/images diff -r 5a6155d9197a -r 7a731e6f61a6 tazpanel/pkgs --- a/tazpanel/pkgs Fri Apr 03 15:51:06 2015 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -TEXTDOMAIN_original=$TEXTDOMAIN -export TEXTDOMAIN='tazpkg' - -cat < - $(gettext 'Packages') - -
  • $(gettext 'Summary')
    • -
  • $(gettext 'My packages')
    • -
  • $(gettext 'Recharge list')
    • -
  • $(gettext 'Check updates')
    • -
  • $(gettext 'Administration')
    • -     - -EOT - -export TEXTDOMAIN=$TEXTDOMAIN_original diff -r 5a6155d9197a -r 7a731e6f61a6 tazpanel/pkgs.cgi --- a/tazpanel/pkgs.cgi Fri Apr 03 15:51:06 2015 +0300 +++ b/tazpanel/pkgs.cgi Mon Apr 06 18:21:06 2015 +0200 @@ -16,7 +16,6 @@ . /etc/slitaz/tazpkg.conf get_config -header _() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; } _n() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; } @@ -24,6 +23,35 @@ local S="$1" P="$2" N="$3"; shift 3; printf "$(ngettext "$S" "$P" "$N")" "$@"; } +#------ +# menu +#------ +case "$1" in + menu) + TEXTDOMAIN_original=$TEXTDOMAIN + export TEXTDOMAIN='tazpkg' + + cat < + $(gettext 'Packages') + +
  • $(gettext 'Summary')
    • +
  • $(gettext 'My packages')
    • +EOT + [ "$REMOTE_USER" == "root" ] && cat << EOT +
  • $(gettext 'Recharge list')
    • +
  • $(gettext 'Check updates')
    • +
  • $(gettext 'Administration')
    • +EOT + cat < + +EOT + export TEXTDOMAIN=$TEXTDOMAIN_original + exit +esac + +header # xHTML 5 header with special side bar for categories. TITLE=$(TEXTDOMAIN='tazpkg'; _ 'TazPanel - Packages') @@ -519,6 +547,8 @@

    $(_ 'Packages list')

    $title

    +EOT + [ "$REMOTE_USER" == "root" ] && cat << EOT
    $(_ 'Selected packages:')
    @@ -529,6 +559,8 @@ $(show_button toggle)
    +EOT + cat << EOT
    EOT @@ -1247,6 +1279,7 @@ EOT fslink=$(readlink $PKGS_DB/fslink) [ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && show_button linkable + [ "$REMOTE_USER" == "root" ] && show_button recharge up admin cat << EOT
    @@ -1278,6 +1311,7 @@ esac else _ 'never.' + [ "$REMOTE_USER" == "root" ] && _ 'You need to [download] the lists for further work.' | \ sed 's|\[||;s|\]||' fi)