CVS: moonbase/utils/linux-wlan-ng PRE_BUILD,1.1,1.2

[Steven Michaelske]

Update of /var/cvs/lunar/moonbase/utils/linux-wlan-ng
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20262

Modified Files:
	PRE_BUILD 
Log Message:
Looking at code, I found some of my errors from before. I fixed them and cleaned up the code


Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/linux-wlan-ng/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	28 Jan 2003 20:52:42 -0000	1.1
+++ PRE_BUILD	12 Nov 2003 03:15:14 -0000	1.2
@@ -4,23 +4,25 @@
     message "\n${MESSAGE_COLOR}The module pcmcia-cs is installed.\nAs a configured source tree is required for the build on will be replicated for the build.${DEFAULT_COLOR}\n"
     
     PC_DETAILS="$MOONBASE/`lvu where pcmcia-cs`/pcmcia-cs/DETAILS"
+    debug_msg "PC_DETAILS = $PC_DETAILS"
     PC_VER="`grep VERSION= $PC_DETAILS | sed s/^[[:space:]]*// | sed s/VERSION=//`"
-    validate_source_dir $BUILD_DIRESTORY/pcmcia-cs-$PC_VER
-    if [[ ! -d $BUILD_DIRECTORY/pcmcia-cs-$PC_VER ]] &&
+    debug_msg "PC_VER = $PC_VER"
+    validate_source_dir $BUILD_DIRECTORY/pcmcia-cs-$PC_VER
+    if [[ ! -d $BUILD_DIRECTORY/pcmcia-cs-$PC_VER ]] ||
        [[ $KEEP_SOURCE == "off" ]]; then
         mk_source_dir $BUILD_DIRECTORY/pcmcia-cs-$PC_VER
 	unpack pcmcia-cs-$PC_VER.tar.gz
 	UNPACKED_PC_SRC=yes
-	CUR_PWD=`pwd`
-	cd $BUILD_DIRECTORY/pcmcia-cs-$PC_VER
+	pushd $BUILD_DIRECTORY/pcmcia-cs-$PC_VER
 	AIRSNORT="`grep AIRSNORT= $DEPENDS_CONFIG/pcmcia-cs | sed s/AIRSNORT=// | sed 's/"//g'`"
-	AIRSNORT_PATCH=`grep SOURCE2= $PC_DETAILS | sed s/^[[:space:]]*// | sed s/SOURCE2=//`
+	AIRSNORT_PATCH=`grep SOURCE2= $PC_DETAILS | sed s/^[[:space:]]*// | sed s/SOURCE2=// | sed 's/$MODULE/pcmcia-cs/'`
+	debug_msg "AIRSNORT_PATCH = $AIRSNORT_PATCH"
 	if [ "$AIRSNORT" == "y" ]; then
-	patch -p0 < $SOURCE_CACHE/$AIRSNORT_PATCH
+	patch_it $SOURCE_CACHE/$AIRSNORT_PATCH 1
 	fi
 	PC_OPTS="`grep OPTS= $DEPENDS_CONFIG/pcmcia-cs | sed s/OPTS=// | sed 's/"//g'`"
 	./Configure -n --sysv --rcdir=/etc --srctree $PC_OPTS
-	cd $CUR_PWD
+	popd
     else
         message "\n${MESSAGE_COLOR}If you do not use KEEP_SOURCE then there may be a problem with pcmcia-cs on your system.${DEFAULT_COLOR}\n"
     fi