mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-05-27 10:44:33 +00:00
cat on a empty string will block the script
This commit is contained in:
parent
fa3b5ae9e6
commit
5b71ce815c
@ -40,7 +40,7 @@ doReadCFG()
|
|||||||
[ -f $CFG ] && FILE=$CFG
|
[ -f $CFG ] && FILE=$CFG
|
||||||
|
|
||||||
if [ ! -z $FILE ];then
|
if [ ! -z $FILE ];then
|
||||||
host=`cat $FILE 2> /dev/null |grep host |cut -d = -f 2`
|
host=`cat $FILE 2> /dev/null |grep host |cut -d = -f 2`
|
||||||
server=`cat $FILE 2> /dev/null |grep server |cut -d = -f 2`
|
server=`cat $FILE 2> /dev/null |grep server |cut -d = -f 2`
|
||||||
user=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 1`
|
user=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 1`
|
||||||
pass=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 2`
|
pass=`cat $FILE 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 2`
|
||||||
@ -169,6 +169,7 @@ case $cmd in
|
|||||||
OLDIP=`cat $IPFILE`
|
OLDIP=`cat $IPFILE`
|
||||||
doGetWANIP
|
doGetWANIP
|
||||||
echo $WANIP > $IPFILE
|
echo $WANIP > $IPFILE
|
||||||
|
FILE="/tmp/none"
|
||||||
[ -f $CFG_disabled ] && FILE=$CFG_disabled
|
[ -f $CFG_disabled ] && FILE=$CFG_disabled
|
||||||
[ -f $CFG ] && FILE=$CFG
|
[ -f $CFG ] && FILE=$CFG
|
||||||
cat $FILE |grep -v execute > ${FILE}.tmp
|
cat $FILE |grep -v execute > ${FILE}.tmp
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user