tazpanel rev 194
Add cat support in terminal and fix log file path
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Jun 10 22:29:16 2011 +0200 (2011-06-10) |
parents | f054918e093c |
children | 4a4d48fb6190 |
files | Makefile data/tazpanel.conf index.cgi |
line diff
1.1 --- a/Makefile Fri Jun 10 22:09:36 2011 +0200 1.2 +++ b/Makefile Fri Jun 10 22:29:16 2011 +0200 1.3 @@ -41,13 +41,15 @@ 1.4 $(DESTDIR)$(PREFIX)/share/applications \ 1.5 $(DESTDIR)$(PREFIX)/share/pixmaps \ 1.6 $(DESTDIR)$(SYSCONFDIR) \ 1.7 - $(DESTDIR)$(PANEL) 1.8 + $(DESTDIR)$(PANEL) \ 1.9 + $(DESTDIR)/var/log 1.10 cp -a tazpanel $(DESTDIR)$(PREFIX)/bin 1.11 cp -a data/*.conf $(DESTDIR)$(SYSCONFDIR) 1.12 cp -a *.cgi lib/ styles/ doc/ README $(DESTDIR)$(PANEL) 1.13 cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale 1.14 cp -a data/*.desktop $(DESTDIR)$(PREFIX)/share/applications 1.15 cp -a data/*.png $(DESTDIR)$(PREFIX)/share/pixmaps 1.16 + touch $(DESTDIR)/var/log/tazpanel.log 1.17 1.18 # Clean source 1.19
2.1 --- a/data/tazpanel.conf Fri Jun 10 22:09:36 2011 +0200 2.2 +++ b/data/tazpanel.conf Fri Jun 10 22:29:16 2011 +0200 2.3 @@ -16,7 +16,7 @@ 2.4 DEBUG="0" 2.5 2.6 # Activity log file 2.7 -LOG_FILE="/var/log/slitaz/tazpanel.log" 2.8 +LOG_FILE="/var/log/tazpanel.log" 2.9 2.10 # Terminal settings 2.11 TERMINAL="xterm"
3.1 --- a/index.cgi Fri Jun 10 22:09:36 2011 +0200 3.2 +++ b/index.cgi Fri Jun 10 22:29:16 2011 +0200 3.3 @@ -104,7 +104,7 @@ 3.4 fi ;; 3.5 *\ terminal\ *|*\ cmd\ *) 3.6 # Cmdline terminal. 3.7 - commands='du help ls ping pwd who wget' 3.8 + commands='cat du help ls ping pwd who wget' 3.9 cmd=$(GET cmd) 3.10 TITLE="- $(gettext "Terminal")" 3.11 xhtml_header 3.12 @@ -128,6 +128,12 @@ 3.13 cd $dl && $cmd ;; 3.14 du*|ls*|ping*|pwd|who) 3.15 $cmd ;; 3.16 + cat*) 3.17 + # Cmd must be used with an arg. 3.18 + arg=$(echo $cmd | awk '{print $2}') 3.19 + [ "$arg" == "" ] && echo -n "$cmd " && \ 3.20 + gettext "needs an arument $arg" && exit 0 3.21 + $cmd ;; 3.22 *) 3.23 [ "$cmd" == "" ] || \ 3.24 gettext "Unknow command: $cmd"