# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1461588162 -7200
# Node ID 5f988d8f32b1ae063f3aa770176e8664d7dc836a
# Parent  84e0d9c05b0fd7bba75e0eb7bf3f17cb57717156
settings.cgi: fix env for lxpanel & date

diff -r 84e0d9c05b0f -r 5f988d8f32b1 settings.cgi
--- a/settings.cgi	Wed Apr 20 11:36:15 2016 +0300
+++ b/settings.cgi	Mon Apr 25 14:42:42 2016 +0200
@@ -37,11 +37,11 @@
 	[ -z "$DISPLAY" ] && export DISPLAY=':0.0'
 
 	# find LXPanel ProcessID, filter out zombie '[lxpanel]' (if any)
-	lxpanel_pid="$(ps -o comm,pid,args | fgrep lxpanel | fgrep -v fgrep | fgrep -v '[' | awk '{print $2}')"
+	lxpanel_pid="$(ps -o comm,pid,args | grep lxpanel | grep -v -E 'grep|sh|\[' | awk '{print $2}')"
 
 	# if LXPanel not running, just run it with default option
 	if [ -z "$lxpanel_pid" ]; then
-		lxpanel -p slitaz &
+		sh -l -c "lxpanel -p slitaz" &
 	else
 		# who started LXPanel?..
 		lxpanel_user="$(ps -o pid,user | fgrep "$lxpanel_pid " | awk '{print $2}')"
@@ -54,7 +54,7 @@
 
 			# stop LXPanel and start it again with the same command
 			kill $lxpanel_pid
-			$lxpanel_comm &
+			sh -l -c "$lxpanel_comm" &
 		fi
 	fi
 
@@ -122,7 +122,7 @@
 
 			rdate)
 				# get and possibly set the system date/time from a remote host
-				rdate -s tick.greyware.com ;;
+				sh -l -c "rdate -s tick.greyware.com" ;;
 
 			hwclock)
 				# query and set hardware clock (RTC)
@@ -130,7 +130,7 @@
 
 			gethwclock)
 				# get date/time from hardware clock (AJAX)
-				header; hwclock -ur | sed 's|0.000000 seconds||'; exit 0;;
+				header; sh -l -c "hwclock -ur | sed 's|0.000000 seconds||'"; exit 0;;
 
 		esac
 		;;
@@ -634,7 +634,7 @@
 		</fieldset>
 
 		<fieldset><legend>$(_ 'System time:')</legend>
-			$(date | sed 's|[0-9][0-9]:[0-9:]*|<span id="time">&</span>|')
+			$(sh -l -c date | sed 's|[0-9][0-9]:[0-9:]*|<span id="time">&</span>|')
 			<button name="do" value="rdate" data-icon="@sync@">$(_ 'Sync online')</button>
 		</fieldset>