tazpkg rev 764
pkgs.cgi: non root support
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Apr 06 18:21:06 2015 +0200 (2015-04-06) |
parents | 5a6155d9197a |
children | 7a8c81c59ae6 |
files | Makefile tazpanel/pkgs tazpanel/pkgs.cgi |
line diff
1.1 --- a/Makefile Fri Apr 03 15:51:06 2015 +0300 1.2 +++ b/Makefile Mon Apr 06 18:21:06 2015 +0200 1.3 @@ -22,7 +22,7 @@ 1.4 --package-name=TazPkg \ 1.5 --package-version="$(VERSION)" -kaction -ktitle -k_ -k_n -k_p:1,2 \ 1.6 ./tazpkg ./modules/tazpkg-convert ./modules/tazpkg-find-depends ./tazpkg-box \ 1.7 - ./tazpanel/pkgs ./tazpanel/pkgs.cgi ./tazpkg-notify 1.8 + ./tazpanel/pkgs.cgi ./tazpkg-notify 1.9 1.10 msgmerge: 1.11 @for l in $(LINGUAS); do \ 1.12 @@ -70,7 +70,7 @@ 1.13 # TazPanel files 1.14 install -m 0755 -d $(DESTDIR)/var/www/tazpanel/menu.d 1.15 cp -a tazpanel/pkgs.cgi $(DESTDIR)/var/www/tazpanel 1.16 - cp -a tazpanel/pkgs $(DESTDIR)/var/www/tazpanel/menu.d 1.17 + ln -s ../pkgs.cgi $(DESTDIR)/var/www/tazpanel/menu.d/pkgs 1.18 install -m 0755 -d $(DESTDIR)/var/www/tazpanel/styles/default 1.19 cp -a tazpanel/pkgs.css $(DESTDIR)/var/www/tazpanel/styles/default 1.20 install -m 0755 -d $(DESTDIR)/var/www/tazpanel/styles/default/images
2.1 --- a/tazpanel/pkgs Fri Apr 03 15:51:06 2015 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,17 +0,0 @@ 2.4 -TEXTDOMAIN_original=$TEXTDOMAIN 2.5 -export TEXTDOMAIN='tazpkg' 2.6 - 2.7 -cat <<EOT 2.8 - <li tabindex="0"> 2.9 - <span>$(gettext 'Packages')</span> 2.10 - <menu> 2.11 - <li><a data-icon="info" href="/pkgs.cgi">$(gettext 'Summary')</a></li> 2.12 - <li><a data-icon="list" href="/pkgs.cgi?list&my=my&cat=all&repo=Any">$(gettext 'My packages')</a></li> 2.13 - <li><a data-icon="refresh" href="/pkgs.cgi?recharge">$(gettext 'Recharge list')</a></li> 2.14 - <li><a data-icon="upgrade" href="/pkgs.cgi?up">$(gettext 'Check updates')</a></li> 2.15 - <li><a data-icon="admin" href="/pkgs.cgi?admin">$(gettext 'Administration')</a></li> 2.16 - </menu> 2.17 - </li> 2.18 -EOT 2.19 - 2.20 -export TEXTDOMAIN=$TEXTDOMAIN_original
3.1 --- a/tazpanel/pkgs.cgi Fri Apr 03 15:51:06 2015 +0300 3.2 +++ b/tazpanel/pkgs.cgi Mon Apr 06 18:21:06 2015 +0200 3.3 @@ -16,7 +16,6 @@ 3.4 . /etc/slitaz/tazpkg.conf 3.5 3.6 get_config 3.7 -header 3.8 3.9 _() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; } 3.10 _n() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; } 3.11 @@ -24,6 +23,35 @@ 3.12 local S="$1" P="$2" N="$3"; shift 3; 3.13 printf "$(ngettext "$S" "$P" "$N")" "$@"; } 3.14 3.15 +#------ 3.16 +# menu 3.17 +#------ 3.18 +case "$1" in 3.19 + menu) 3.20 + TEXTDOMAIN_original=$TEXTDOMAIN 3.21 + export TEXTDOMAIN='tazpkg' 3.22 + 3.23 + cat <<EOT 3.24 + <li tabindex="0"> 3.25 + <span>$(gettext 'Packages')</span> 3.26 + <menu> 3.27 + <li><a data-icon="info" href="/pkgs.cgi">$(gettext 'Summary')</a></li> 3.28 + <li><a data-icon="list" href="/pkgs.cgi?list&my=my&cat=all&repo=Any">$(gettext 'My packages')</a></li> 3.29 +EOT 3.30 + [ "$REMOTE_USER" == "root" ] && cat << EOT 3.31 + <li><a data-icon="refresh" href="/pkgs.cgi?recharge">$(gettext 'Recharge list')</a></li> 3.32 + <li><a data-icon="upgrade" href="/pkgs.cgi?up">$(gettext 'Check updates')</a></li> 3.33 + <li><a data-icon="admin" href="/pkgs.cgi?admin">$(gettext 'Administration')</a></li> 3.34 +EOT 3.35 + cat <<EOT 3.36 + </menu> 3.37 + </li> 3.38 +EOT 3.39 + export TEXTDOMAIN=$TEXTDOMAIN_original 3.40 + exit 3.41 +esac 3.42 + 3.43 +header 3.44 3.45 # xHTML 5 header with special side bar for categories. 3.46 TITLE=$(TEXTDOMAIN='tazpkg'; _ 'TazPanel - Packages') 3.47 @@ -519,6 +547,8 @@ 3.48 <h2>$(_ 'Packages list')</h2> 3.49 <p>$title</p> 3.50 3.51 +EOT 3.52 + [ "$REMOTE_USER" == "root" ] && cat << EOT 3.53 <section> 3.54 <div>$(_ 'Selected packages:') <span id="countSelected"></span></div> 3.55 <footer> 3.56 @@ -529,6 +559,8 @@ 3.57 $(show_button toggle) 3.58 </footer> 3.59 </section> 3.60 +EOT 3.61 + cat << EOT 3.62 3.63 <form id="pkglist" class="wide"> 3.64 EOT 3.65 @@ -1247,6 +1279,7 @@ 3.66 EOT 3.67 fslink=$(readlink $PKGS_DB/fslink) 3.68 [ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && show_button linkable 3.69 + [ "$REMOTE_USER" == "root" ] && 3.70 show_button recharge up admin 3.71 cat << EOT 3.72 </form> 3.73 @@ -1278,6 +1311,7 @@ 3.74 esac 3.75 else 3.76 _ 'never.' 3.77 + [ "$REMOTE_USER" == "root" ] && 3.78 _ 'You need to [download] the lists for further work.' | \ 3.79 sed 's|\[|<a data-icon="download" href="?recharge">|;s|\]|</a>|' 3.80 fi)</td></tr>