From 5e2e1fff53ec1cef408b22dc966db133d34a699b Mon Sep 17 00:00:00 2001 From: Michal Pomorski Date: Thu, 10 Feb 2022 02:01:30 +0100 Subject: [PATCH 1/2] Deal with relative paths for the config file. --- prog/pwm/pwmconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig index edcbde9e..e4f05131 100755 --- a/prog/pwm/pwmconfig +++ b/prog/pwm/pwmconfig @@ -31,6 +31,7 @@ LM_VERSION='3.6.0+git' PIDFILE="/var/run/fancontrol.pid" +USERDIR=$(pwd) if [ -f "$PIDFILE" ] then @@ -614,6 +615,10 @@ function AskPath() then FCCONFIG="/etc/fancontrol" fi + if [ ${FCCONFIG::1} != "/" ] + then + FCCONFIG=$(readlink -f $USERDIR/$FCCONFIG) + fi } AskPath From 9943682a8021d95ce17a07f088fe38624a7ff96d Mon Sep 17 00:00:00 2001 From: Michal Pomorski Date: Thu, 10 Feb 2022 02:39:26 +0100 Subject: [PATCH 2/2] Add quotes over path variables. --- prog/pwm/pwmconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig index e4f05131..f7bb0334 100755 --- a/prog/pwm/pwmconfig +++ b/prog/pwm/pwmconfig @@ -617,7 +617,7 @@ function AskPath() fi if [ ${FCCONFIG::1} != "/" ] then - FCCONFIG=$(readlink -f $USERDIR/$FCCONFIG) + FCCONFIG=$(readlink -f "$USERDIR"/"$FCCONFIG") fi } @@ -668,7 +668,7 @@ function LoadConfig() fi } -LoadConfig $FCCONFIG +LoadConfig "$FCCONFIG" # $1 = pwm value below which the fan is stopped function TestMinStart() @@ -820,8 +820,8 @@ function SaveConfig() echo "MINSTOP=$MINSTOP" >>$tmpfile [ -n "$MINPWM" ] && echo "MINPWM=$MINPWM" >>$tmpfile [ -n "$MAXPWM" ] && echo "MAXPWM=$MAXPWM" >>$tmpfile - mv $tmpfile $FCCONFIG - chmod +r $FCCONFIG + mv $tmpfile "$FCCONFIG" + chmod +r "$FCCONFIG" #check if file was written correctly echo 'Configuration saved' }