tazpanel rev 589
settings.cgi: fix env for lxpanel & date
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Mon Apr 25 14:42:42 2016 +0200 (2016-04-25) |
parents | 84e0d9c05b0f |
children | 22a22d1303dd |
files | settings.cgi |
line diff
1.1 --- a/settings.cgi Wed Apr 20 11:36:15 2016 +0300 1.2 +++ b/settings.cgi Mon Apr 25 14:42:42 2016 +0200 1.3 @@ -37,11 +37,11 @@ 1.4 [ -z "$DISPLAY" ] && export DISPLAY=':0.0' 1.5 1.6 # find LXPanel ProcessID, filter out zombie '[lxpanel]' (if any) 1.7 - lxpanel_pid="$(ps -o comm,pid,args | fgrep lxpanel | fgrep -v fgrep | fgrep -v '[' | awk '{print $2}')" 1.8 + lxpanel_pid="$(ps -o comm,pid,args | grep lxpanel | grep -v -E 'grep|sh|\[' | awk '{print $2}')" 1.9 1.10 # if LXPanel not running, just run it with default option 1.11 if [ -z "$lxpanel_pid" ]; then 1.12 - lxpanel -p slitaz & 1.13 + sh -l -c "lxpanel -p slitaz" & 1.14 else 1.15 # who started LXPanel?.. 1.16 lxpanel_user="$(ps -o pid,user | fgrep "$lxpanel_pid " | awk '{print $2}')" 1.17 @@ -54,7 +54,7 @@ 1.18 1.19 # stop LXPanel and start it again with the same command 1.20 kill $lxpanel_pid 1.21 - $lxpanel_comm & 1.22 + sh -l -c "$lxpanel_comm" & 1.23 fi 1.24 fi 1.25 1.26 @@ -122,7 +122,7 @@ 1.27 1.28 rdate) 1.29 # get and possibly set the system date/time from a remote host 1.30 - rdate -s tick.greyware.com ;; 1.31 + sh -l -c "rdate -s tick.greyware.com" ;; 1.32 1.33 hwclock) 1.34 # query and set hardware clock (RTC) 1.35 @@ -130,7 +130,7 @@ 1.36 1.37 gethwclock) 1.38 # get date/time from hardware clock (AJAX) 1.39 - header; hwclock -ur | sed 's|0.000000 seconds||'; exit 0;; 1.40 + header; sh -l -c "hwclock -ur | sed 's|0.000000 seconds||'"; exit 0;; 1.41 1.42 esac 1.43 ;; 1.44 @@ -634,7 +634,7 @@ 1.45 </fieldset> 1.46 1.47 <fieldset><legend>$(_ 'System time:')</legend> 1.48 - $(date | sed 's|[0-9][0-9]:[0-9:]*|<span id="time">&</span>|') 1.49 + $(sh -l -c date | sed 's|[0-9][0-9]:[0-9:]*|<span id="time">&</span>|') 1.50 <button name="do" value="rdate" data-icon="@sync@">$(_ 'Sync online')</button> 1.51 </fieldset> 1.52