Changeset 5321

Timestamp:

09/08/08 14:01:16 (5 years ago)

Author:

khali

Message:

Add a utility function to filter configuration file variables.
Remove unneeded escapes. This makes the code slightly easier to read.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/pwm/pwmconfig (modified) (11 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/pwm/pwmconfig

@@ -649 +649 @@
 DEFMINSTART=150
 DEFMINSTOP=100
+
+function filter_cfgvar()
+{
+        echo "$1" | sed -e 's/ /\n/g' \
+                  | egrep "$2" \
+                  | sed -e 's/.*=//g'
+}
 
 # "select" won't repeat the list of options, so we enclose it in a
@@ -678 +685 @@
                         echo
                         echo "Settings of ${pwmo}:"
-                        echo "  Depends on `echo $FCTEMPS |sed -e 's/ /\n/g' |egrep \"${pwmo}\" |sed -e 's/.*=//g'`"
-                        echo "  Controls `echo $FCFANS |sed -e 's/ /\n/g' |egrep \"${pwmo}\" |sed -e 's/.*=//g'`"
-                        echo "  MINTEMP=`echo $MINTEMP |sed -e \"s/ /\n/g\" |egrep \"${pwmo}\" |sed -e \"s/.*=//g\"`"
-                        echo "  MAXTEMP=`echo $MAXTEMP |sed -e \"s/ /\n/g\" |egrep \"${pwmo}\" |sed -e \"s/.*=//g\"`"
-                        echo "  MINSTART=`echo $MINSTART |sed -e \"s/ /\n/g\" |egrep \"${pwmo}\" |sed -e \"s/.*=//g\"`"
-                        echo "  MINSTOP=`echo $MINSTOP |sed -e \"s/ /\n/g\" |egrep \"${pwmo}\" |sed -e \"s/.*=//g\"`"
-                        XMINP=`echo $MINPWM | sed -e "s/ /\n/g" | egrep "${pwmo}" | sed -e "s/.*=//g"`
+                        echo "  Depends on `filter_cfgvar "$FCTEMPS" "$pwmo"`"
+                        echo "  Controls `filter_cfgvar "$FCFANS" "$pwmo"`"
+                        echo "  MINTEMP=`filter_cfgvar "$MINTEMP" $pwmo`"
+                        echo "  MAXTEMP=`filter_cfgvar "$MAXTEMP" "$pwmo"`"
+                        echo "  MINSTART=`filter_cfgvar "$MINSTART" "$pwmo"`"
+                        echo "  MINSTOP=`filter_cfgvar "$MINSTOP" "$pwmo"`"
+                        XMINP=`filter_cfgvar "$MINPWM" "$pwmo"`
                         [ -n "$XMINP" ] && echo "  MINPWM=$XMINP"
-                        XMAXP=`echo $MAXPWM | sed -e "s/ /\n/g" | egrep "${pwmo}" | sed -e "s/.*=//g"`
+                        XMAXP=`filter_cfgvar "$MAXPWM" "$pwmo"`
                         [ -n "$XMAXP" ] && echo "  MAXPWM=$XMAXP"
                 done
@@ -692 +699 @@
                 break ;;
 
-        "`echo ${pwmactive} |sed -e 's/ /\n/g' | egrep \"${pwms}\"`" )
+        "`echo ${pwmactive} |sed -e 's/ /\n/g' | egrep "${pwms}"`" )
                 pwmsed=`echo ${pwms} | sed -e 's/\//\\\\\//g'` #escape / for sed
                 echo
@@ -713 +720 @@
                 done
                 FAN=`echo $fanactive|cut -d' ' -f$REPLY`
-                FCFANS="`echo $FCFANS | sed -e "s/${pwmsed}[^ ]* *//g\"` ${pwms}=$FAN"
+                FCFANS="`echo $FCFANS | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=$FAN"
                 echo
                 echo "Select a temperature sensor as source for ${pwms}:"
@@ -726 +733 @@
                                         FCTEMPS="${pwms}=${tempss}"
                                 else
-                                        FCTEMPS="`echo $FCTEMPS | sed -e "s/${pwmsed}[^ ]* *//g\"` ${pwms}=${tempss}"
+                                        FCTEMPS="`echo $FCTEMPS | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${tempss}"
                                 fi
                         fi
@@ -741 +748 @@
                                 MINTEMP="${pwms}=${XMT}"
                         else
-                                MINTEMP="`echo $MINTEMP | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMT}"
+                                MINTEMP="`echo $MINTEMP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMT}"
                         fi
                         echo
@@ -755 +762 @@
                                 MAXTEMP="${pwms}=${XMT}"
                         else
-                                MAXTEMP="`echo $MAXTEMP | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMT}"
+                                MAXTEMP="`echo $MAXTEMP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMT}"
                         fi
                         echo
@@ -774 +781 @@
                                 MINSTART="${pwms}=${XMV}"
                         else
-                                MINSTART="`echo $MINSTART | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMV}"
+                                MINSTART="`echo $MINSTART | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMV}"
                         fi
                         echo
@@ -793 +800 @@
                                 MINSTOP="${pwms}=${XMV}"
                         else
-                                MINSTOP="`echo $MINSTOP | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMV}"
+                                MINSTOP="`echo $MINSTOP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMV}"
                         fi
                         echo
@@ -805 +812 @@
                                         MINPWM="${pwms}=${XMINP}"
                                 else
-                                        MINPWM="`echo $MINPWM | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMINP}"
+                                        MINPWM="`echo $MINPWM | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMINP}"
                                 fi
                         fi
@@ -818 +825 @@
                                         MAXPWM="${pwms}=${XMAXP}"
                                 else
-                                        MAXPWM="`echo $MAXPWM | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMAXP}"
+                                        MAXPWM="`echo $MAXPWM | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMAXP}"
                                 fi
                         fi