Navigation


Changeset 506:589c5316baa0 in freeDiameter


Ignore:
Timestamp:
Aug 19, 2010, 7:52:00 PM (14 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

Escape the variables in the shell script...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/OpenWRT/packages/freeDiameter/Makefile

    r505 r506  
    124124# Test if the configuration file contains the local identity already
    125125localid=`sed -n -r -e "s/^[[:space:]]*Identity[[:space:]]*=[[:space:]]*\"([^\"]*)\"[[:space:]]*;/\1/p" /etc/freeDiameter/freeDiameter.conf`
    126 if [ -z "$localid" ]; then
     126if [ -z "\$localid" ]; then
    127127   # Ask for the local name
    128128   echo -n "Full name of your access point? (openwrt.localdomain) : "
    129129   read localid
    130    if [ -z "$localid" ]; then
     130   if [ -z "\$localid" ]; then
    131131      localid="openwrt.localdomain"
    132132   fi
    133    echo "Identity = \"$localid\";" >> /etc/freeDiameter/freeDiameter.conf
     133   echo "Identity = \"\$localid\";" >> /etc/freeDiameter/freeDiameter.conf
    134134fi
    135135
    136136# Is there already a ConnectPeer directive?
    137137grep -q -E -e "^[[:space:]]*ConnectPeer[[:space:]]*=" /etc/freeDiameter/freeDiameter.conf
    138 if [ "$?" -eq "1" ]; then
     138if [ "\$?" -eq "1" ]; then
    139139   echo -n "Diameter Identity of your Diameter server: "
    140140   read serverid
    141    if [ -z "$serverid" ]; then
     141   if [ -z "\$serverid" ]; then
    142142      echo "Skipped. Please add ConnectPeer directive to your /etc/freeDiameter/freeDiameter.conf file later."
    143143   else
     
    145145      read serverip
    146146      connstr=""
    147       if [ -n "$serverip"]; then
    148         connstr=" { ConnectTo = \"$serverip\"; }"
     147      if [ -n "\$serverip"]; then
     148        connstr=" { ConnectTo = \"\$serverip\"; }"
    149149      fi
    150       echo "ConnectPeer = \"$serverid\"$connstr;" >> /etc/freeDiameter/freeDiameter.conf
     150      echo "ConnectPeer = \"\$serverid\"\$connstr;" >> /etc/freeDiameter/freeDiameter.conf
    151151   fi
    152152fi
     
    167167   echo "state = internet"                      >>/tmp/template.cnf
    168168   echo "country = net"                         >>/tmp/template.cnf
    169    echo "cn = $localid"                         >>/tmp/template.cnf
     169   echo "cn = \$localid"                        >>/tmp/template.cnf
    170170   echo "expiration_days = 3650"                >>/tmp/template.cnf
    171171   echo "signing_key"                           >>/tmp/template.cnf
Note: See TracChangeset for help on using the changeset viewer.