Changeset 9690

Timestamp:

Oct 4, 2011, 5:50:42 AM (13 years ago)

Author:

rick

Message:

Allow to run in autosync...

File:

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

src/django_gheat/import_scan_data.sh

@@ -11 +11 @@
 
 DATAROOT_CHOICES="$DATAROOT /usr/local/scan-data"
+
+DEBUG=${DEBUG:-false}
+
+debug() {
+  $DEBUG && echo $*
+}
+
 if [ "$1" ]; then
   DATAROOT=$1
@@ -20 +27 @@
   done
 fi
-echo "# DATAROOT: $DATAROOT"
-echo "# SSH_USER: $SSH_USER"
+debug "# DATAROOT: $DATAROOT"
+debug "# SSH_USER: $SSH_USER"
 
-echo "# rsync webfolder"
+echo "# rsync webfolder" 1>&2
 if [ -r "$SSH_KEY" ]; then
   SSH_KEY_OPT="-i $SSH_KEY"
@@ -32 +39 @@
   SSH_USER=${SSH_USER:-$SUDO_USER}
 fi
-echo rsync -avz -e "ssh $SSH_KEY_OPT -l $SSH_USER -o StrictHostKeyChecking=no" tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT
+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
 
 
-echo "# unzip compressed .tar.gz files"
+debug "# unzip compressed .tar.gz files"
 for FILE in `find $DATAROOT -name '*.tar.gz' | sort`; do
   TARDIR=`dirname $FILE`
@@ -41 +48 @@
 done
 
-echo "# unzip compressed .zip files"
+debug "# unzip compressed .zip files"
 for FILE in `find $DATAROOT -name '*.zip' | sort`; do
   ARCHIVEDIR=`dirname $FILE`
-  (cd $ARCHIVEDIR; unzip -n $FILE )
+  (cd $ARCHIVEDIR; unzip -qn $FILE )
 done
 
@@ -73 +80 @@
 
 if [ -r $MAP_CACHE ]; then
-  echo "# Clear cache $MAP_CACHE"
+  debug "# Clear cache $MAP_CACHE"
   htcacheclean -v -l10K -p$MAP_CACHE 
 fi