[zaptel-commits] qwell: trunk r1665 - in /trunk: ./ build_tools/genmodconf

[zaptel-commits at lists.digium.com]

Author: qwell
Date: Wed Nov 29 18:26:56 2006
New Revision: 1665

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1665
Log:
Merged revisions 1664 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1664 | qwell | 2006-11-29 18:24:30 -0600 (Wed, 29 Nov 2006) | 10 lines

Merged revisions 1663 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1663 | qwell | 2006-11-29 18:23:33 -0600 (Wed, 29 Nov 2006) | 2 lines

Fix issue that was discovered by using dash as /bin/sh instead of bash.

........

................

Modified:
    trunk/   (props changed)
    trunk/build_tools/genmodconf

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Nov 29 18:26:56 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664

Modified: trunk/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/trunk/build_tools/genmodconf?view=diff&rev=1665&r1=1664&r2=1665
==============================================================================
--- trunk/build_tools/genmodconf (original)
+++ trunk/build_tools/genmodconf Wed Nov 29 18:26:56 2006
@@ -31,7 +31,7 @@
 # line to commands in 'install' rules, thus keeping them from being lost, so
 # we try to determine what version is installed and take advantage of that
 
-if [ "${1}" == "linux24" ]; then
+if [ "${1}" = "linux24" ]; then
     if [ -d ${2}/etc/modutils ]; then
 	target=${2}/etc/modutils/zaptel
     elif [ -f ${2}/etc/modules.conf ]; then
@@ -41,7 +41,7 @@
 	echo No suitable location for module rules can be found... exiting.
 	exit 1
     fi
-elif [ "${1}" == "linux26" ]; then
+elif [ "${1}" = "linux26" ]; then
     toolver=`/sbin/modprobe --version | awk '{print $$3;}' | cut -d. -f2 | cut -d- -f1`
     if [ ${toolver} -ge 2 ]; then
 	cmdopts=\$CMDLINE_OPTS
@@ -79,13 +79,13 @@
 
 echo Building ${target}...
 
-if [ "${1}" == "linux24" ]; then
+if [ "${1}" = "linux24" ]; then
     for mod in ${3}; do
 	if ! grep -q "post-install ${mod} " ${target}; then
 	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
 	fi
     done
-elif [ "${1}" == "linux26" ]; then
+elif [ "${1}" = "linux26" ]; then
     for mod in ${3}; do
 	if ! grep -q "install ${mod} " ${target}; then
 	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}