Changeset 9777

Timestamp:

Dec 14, 2011, 4:51:46 PM (13 years ago)

Author:

rick

Message:

By making directories the data should be more easy to parse..

File:

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

src/django_gheat/import_scan_data.sh

@@ -37 +37 @@
   echo "# warning automatic ssh key $SSH_KEY not readable"
   SSH_KEY_OPT=''
-  SSH_USER=${SSH_USER:-$SUDO_USER}
+  SSH_USER=${SSH_USER:-${SUDO_USER:-$USER}}
 fi
 rsync -O --out-format="%n%L" -az -e "ssh $SSH_KEY_OPT -l $SSH_USER -o StrictHostKeyChecking=no" tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT
 
-
 debug "# unzip compressed .tar.gz files"
 for FILE in `find $DATAROOT -name '*.tar.gz' | sort`; do
-  TARDIR=`dirname $FILE`
-  tar -C $TARDIR -xkzf $FILE
+  TARDIR=`dirname $FILE`/`basename $FILE .tar.gz`
+  if [ ! -d $TARDIR ]; then
+    mkdir $TARDIR
+    tar -C $TARDIR -xvzf $FILE
+  fi
 done
 
 debug "# unzip compressed .zip files"
 for FILE in `find $DATAROOT -name '*.zip' | sort`; do
-  ARCHIVEDIR=`dirname $FILE`
-  (cd $ARCHIVEDIR; unzip -qn $FILE )
+  ARCHIVEDIR=`dirname $FILE`/`basename $FILE .zip`
+  if [ ! -d $ARCHIVEDIR ]; then
+    mkdir $ARCHIVEDIR
+    (cd $ARCHIVEDIR; unzip -qn $FILE )
+  fi
 done
 
@@ -65 +70 @@
     ARGS="-g $USERNAME -e $USERNAME@wirelessleiden.nl -k $DEVICE"
 
+    # DroidStumber imports
+    FILES=`find $DEVICEDIR -name 'ScanResult-*'`
+    [ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
+
     #Kismet gpsxml Imports
     FILES="`find $DEVICEDIR -name '*gpsxml*'`"
-    [ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
-
-    # DroidStumber imports
-    FILES=`find $DEVICEDIR -name 'ScanResult-*'`
     [ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES