[Devil-linux-commit] build/scripts eagle-usb,1.5,1.6 frox,1.4,1.5 snort,1.16,1.17

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29938/scripts

Modified Files:
	eagle-usb frox snort 
Log Message:
corrected path names


Index: eagle-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- eagle-usb	26 Nov 2004 03:58:07 -0000	1.5
+++ eagle-usb	26 Nov 2004 17:11:08 -0000	1.6
@@ -42,9 +42,11 @@
 			mkdir -p $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp/etc/eagle-usb/scripts || exit 1
 			make install DESTDIR=$WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/share/eagle-usb
-			mv  $WORKDIR/tmp/etc/eagle-usb/dsp $WORKDIR/tmp/usr/share/eagle-usb || exit 1
-			mv  $WORKDIR/tmp/etc/eagle-usb/lang $WORKDIR/tmp/usr/share/eagle-usb || exit 1
+
+			mkdir -p $CDDIR/usr/share/eagle-usb/{dsp,lang} || exit 1
+			mv -f $WORKDIR/tmp/etc/eagle-usb/dsp/* $CDDIR/usr/share/eagle-usb/dsp/ || exit 1
+			mv -f $WORKDIR/tmp/etc/eagle-usb/lang/* $CDDIR/usr/share/eagle-usb/lang/ || exit 1
+			rm -rf $WORKDIR/tmp/etc/eagle-usb/{dsp,lang} || exit 1
 
 			copy_files $WORKDIR/tmp/usr/sbin $CDDIR/usr/ || exit 1
 			copy_files $WORKDIR/tmp/lib $CDDIR || exit 1

Index: frox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/frox,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- frox	12 Nov 2004 01:23:57 -0000	1.4
+++ frox	26 Nov 2004 17:11:08 -0000	1.5
@@ -49,7 +49,7 @@
 		gzip -c -9 < doc/frox.man > $WORKDIR/tmp/usr/share/man/man8/frox.conf.8.gz || exit 1
 		mkdir -p $WORKDIR/tmp/usr/share/man/man5 || exit 1
 		gzip -c -9 < doc/frox.conf.man > $WORKDIR/tmp/usr/share/man/man5/frox.5.gz || exit 1
-		copy_files src/frox.conf $ETCDIR || exit 1
+		copy_files src/frox.conf $ETCDIR/etc/ || exit 1
 		copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
 
 		rm -rf $WORKDIR/tmp || exit 1

Index: snort
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/snort,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- snort	26 Nov 2004 03:58:07 -0000	1.16
+++ snort	26 Nov 2004 17:11:08 -0000	1.17
@@ -47,19 +47,19 @@
 		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
 
-        	mkdir -p $WORKDIR/tmp/usr/share/snort/rules
-		mkdir -p $ETCDIR/etc/snort || exit 1
-		cp -dpR ./rules/ $WORKDIR/tmp/usr/share/snort || exit 1
-		rm -rf $WORKDIR/tmp/usr/share/snort/rules/Makefile || exit 1
-		rm -rf $WORKDIR/tmp/usr/share/snort/rules/Makefile.* || exit 1
+        	mkdir -p $CDDIR/usr/share/snort/rules
+		cp -dpR ./rules/ $CDDIR/usr/share/snort || exit 1
+		rm -rf $CDDIR/usr/share/snort/rules/Makefil* || exit 1
 
-		cp ./etc/* $ETCDIR/etc/snort || exit 1
+		mkdir -p $ETCDIR/etc/snort || exit 1
+		cp ./etc/* $ETCDIR/etc/snort/ || exit 1
+		rm -rf $ETCDIR/etc/snort/Makefil* || exit 1
 		cp $MYDIR/scripts/snort $ETCDIR/etc/init.d || exit 1
 		
-		for FILE in $(ls $WORKDIR/tmp/usr/share/snort )
+		for FILE in $(ls $CDDIR/usr/share/snort/rules/* )
 		do
 		    F=${FILE##/*/}
-		    ln -sf /usr/share/snort/$F /etc/snort/$F
+		    ln -sf /usr/share/snort/rules/$F $ETCDIR/etc/snort/$F
 		done
 
 		echo "# Start Snort?" >> $CONFIGFILE