Changeset 9566

Timestamp:

Aug 25, 2011, 1:39:39 PM (13 years ago)

Author:

rick

Message:

Make the output sorted for more easier debugging.

File:

• src/django_gheat/import_scan_data.sh (modified) (2 diffs)

src/django_gheat/import_scan_data.sh

@@ -15 +15 @@
 
 echo "# unzip compressed .tar.gz files"
-for FILE in `find $DATAROOT -name '*.tar.gz'`; do
+for FILE in `find $DATAROOT -name '*.tar.gz' | sort`; do
   TARDIR=`dirname $FILE`
   tar -C $TARDIR -xkzf $FILE
@@ -23 +23 @@
 
 #Kismet netxml Imports
-FILES="`find $DATAROOT -name '*netxml*'`"
+FILES="`find $DATAROOT -name '*netxml*' | sort`"
 [ -n "$FILES" ] && $MANAGE import_kismet $ARGS $FILES
 
 # Import all measure data
-for USERDIR in `find $DATAROOT -maxdepth 1 -type d`; do
-  for DEVICEDIR in `find $USERDIR -maxdepth 1 -type d`; do
+for USERDIR in `find $DATAROOT -mindepth 1 -maxdepth 1 -type d | sort`; do
+  for DEVICEDIR in `find $USERDIR -mindepth 1 -maxdepth 1 -type d | sort`; do
     USERNAME=`basename $USERDIR`
     DEVICE=`basename $DEVICEDIR`
     ARGS="-g $USERNAME -e $USERNAME@wirelessleiden.nl -k $DEVICE"
 
+    echo $ARGS
     #Kismet gpsxml Imports
-    FILES="`find $DEVICEDIR -name '*netxml*'` `find $DEVICEDIR -name '*gpsxml*'`"
+    FILES="`find $DEVICEDIR -name '*gpsxml*'`"
     [ -n "$FILES" ] && $MANAGE import_kismet $ARGS $FILES