nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

consistent use of dollar bracket to assign variables from system call

Browse Source
This commit is contained in:
Daniel Steglich 2015-03-03 21:10:04 +01:00
parent f611614c14
commit b782f36b28
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
actions/dynamicdns
View File

@ -91,7 +91,7 @@ doWriteCFG()
rm ${STATUSFILE} 2> /dev/null rm ${STATUSFILE} 2> /dev/null
#find the interface (always the default gateway interface) #find the interface (always the default gateway interface)
default_interface=`ip route |grep default |awk '{print $5}'` default_interface=$(ip route |grep default |awk '{print $5}')
#store the given options in ez-ipupdate compatible config file #store the given options in ez-ipupdate compatible config file
echo "host=${host}" > ${out_file} echo "host=${host}" > ${out_file}
@ -112,7 +112,7 @@ doWriteCFG()
echo "NAT unknown" >> ${HELPERCFG} echo "NAT unknown" >> ${HELPERCFG}
else else
doGetWANIP doGetWANIP
ISGLOBAL=`ip addr ls ${default_interface} | grep ${wanip}` ISGLOBAL=$(ip addr ls ${default_interface} | grep ${wanip})
if [ -z ${ISGLOBAL} ];then if [ -z ${ISGLOBAL} ];then
#we are behind NAT #we are behind NAT
echo "NAT yes" >> ${HELPERCFG} echo "NAT yes" >> ${HELPERCFG}
@ -137,23 +137,23 @@ doReadCFG()
ipurl="" ipurl=""
if [ ! -z ${cfgfile} ];then if [ ! -z ${cfgfile} ];then
host=`cat ${cfgfile} 2> /dev/null |grep host |cut -d = -f 2` host=$(cat ${cfgfile} 2> /dev/null |grep host |cut -d = -f 2)
server=`cat ${cfgfile} 2> /dev/null |grep server |cut -d = -f 2 |grep -v ^\'\'` server=$(cat ${cfgfile} 2> /dev/null |grep server |cut -d = -f 2 |grep -v ^\'\')
user=`cat ${cfgfile} 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 1 ` user=$(cat ${cfgfile} 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 1 )
pass=`cat ${cfgfile} 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 2` pass=$(cat ${cfgfile} 2> /dev/null |grep user |cut -d = -f 2 |cut -d : -f 2)
fi fi
if [ ! -z ${HELPERCFG} ];then if [ ! -z ${HELPERCFG} ];then
ipurl=`cat ${HELPERCFG} 2> /dev/null |grep ^IPURL |awk '{print $2}' |grep -v ^\'\'` ipurl=$(cat ${HELPERCFG} 2> /dev/null |grep ^IPURL |awk '{print $2}' |grep -v ^\'\')
updateurl=`cat ${HELPERCFG} 2> /dev/null |grep POSTURL |awk '{print $2}' |grep -v ^\'\'` updateurl=$(cat ${HELPERCFG} 2> /dev/null |grep POSTURL |awk '{print $2}' |grep -v ^\'\')
basicauth=`cat ${HELPERCFG} 2> /dev/null |grep POSTAUTH |awk '{print $2}' |grep -v ^\'\'` basicauth=$(cat ${HELPERCFG} 2> /dev/null |grep POSTAUTH |awk '{print $2}' |grep -v ^\'\')
ignoreCertError=`cat ${HELPERCFG} 2> /dev/null |grep POSTSSLIGNORE |awk '{print $2}' |grep -v ^\'\'` ignoreCertError=$(cat ${HELPERCFG} 2> /dev/null |grep POSTSSLIGNORE |awk '{print $2}' |grep -v ^\'\')
fi fi
} }
doStatus() doStatus()
{ {
PROC=`pgrep ${TOOLNAME}` PROC=$(pgrep ${TOOLNAME})
if [ -f ${CRONJOB} ];then if [ -f ${CRONJOB} ];then
echo enabled echo enabled
elif [ ! -z ${PROC} ];then elif [ ! -z ${PROC} ];then
@ -254,13 +254,13 @@ case ${cmd} in
fi fi
;; ;;
get-nat) get-nat)
NAT=`cat $HELPERCFG 2> /dev/null |grep ^NAT | awk '{print $2}'` NAT=$(cat $HELPERCFG 2> /dev/null |grep ^NAT | awk '{print $2}')
[ -z ${NAT} ] && NAT="unknown" [ -z ${NAT} ] && NAT="unknown"
echo ${NAT} echo ${NAT}
;; ;;
update) update)
doReadCFG doReadCFG
oldip=`cat ${IPFILE}` oldip=$(cat ${IPFILE})
doGetWANIP doGetWANIP
echo ${wanip} > ${IPFILE} echo ${wanip} > ${IPFILE}
cat ${cfgfile} |grep -v execute > ${cfgfile}.tmp cat ${cfgfile} |grep -v execute > ${cfgfile}.tmp
@ -272,10 +272,10 @@ case ${cmd} in
fi fi
#if we don't know our WAN IP do a blind update once a hour #if we don't know our WAN IP do a blind update once a hour
if [ "${wanip}" = ${NOIP} ];then if [ "${wanip}" = ${NOIP} ];then
uptime=`cat /proc/uptime |cut -d . -f 1` uptime=$(cat /proc/uptime |cut -d . -f 1)
LAST=0 LAST=0
[ -f ${LASTUPDATE} ] && LAST=`cat ${LASTUPDATE}` [ -f ${LASTUPDATE} ] && LAST=$(cat ${LASTUPDATE})
diff=`expr ${uptime} - ${LAST}` diff=$(expr ${uptime} - ${LAST})
if [ ${diff} -gt ${UPDATEMINUTESUNKNOWN} ];then if [ ${diff} -gt ${UPDATEMINUTESUNKNOWN} ];then
doUpdate doUpdate
fi fi
@ -288,7 +288,7 @@ case ${cmd} in
mv ${CFG} ${CFG_disabled} mv ${CFG} ${CFG_disabled}
;; ;;
success) success)
date=`date` date=$(date)
echo "last update done (${date})" > ${STATUSFILE} echo "last update done (${date})" > ${STATUSFILE}
cat /proc/uptime |awk '{print $1}' |cut -d . -f 1 > ${LASTUPDATE} cat /proc/uptime |awk '{print $1}' |cut -d . -f 1 > ${LASTUPDATE}
#if called from cronjob, the current IP is given as parameter #if called from cronjob, the current IP is given as parameter
@ -301,7 +301,7 @@ case ${cmd} in
fi fi
;; ;;
failed) failed)
date=`date` date=$(date)
echo "last update failed (${date})" > ${STATUSFILE} echo "last update failed (${date})" > ${STATUSFILE}
;; ;;
get-last-success) get-last-success)