From 531a588d3974d241228d5a619d5f39daf9fcfe3b Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Thu, 21 May 2015 22:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A3=E5=88=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=9B=E5=AF=B9=E6=96=87=E6=9C=AC=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dataset-diff.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dataset-diff.sh b/dataset-diff.sh
index 348bd61..8c3677a 100755
--- a/dataset-diff.sh
+++ b/dataset-diff.sh
@@ -15,12 +15,13 @@ fcount=`find -L "$datapath"/* | wc -l`
 curpath=`pwd`
 if [ $fcount -gt 0 ]; then
 	cd $datapath
-	find . -printf "%p %s\n" | grep -v '^\./ 4096$|^\. 4096$' | sort >> $curpath/$uuid-fs.txt
+	find . -printf "%p %s\n" | grep -v '^\./ 4096$\|^\. 4096$' | sort >> $curpath/$uuid-fs.txt
 else
 	echo $datapath;
 fi
 
 cd $curpath
+cat $uuid-db.txt | sort > $uuid-db.txt
 if ! diff -q $uuid-db.txt $uuid-fs.txt > /dev/null; then
 	vimdiff -c ":TOhtml | :wq | :q | :q" $uuid-db.txt $uuid-fs.txt
 	cp Diff.html /var/www/ftp2.westgis.ac.cn/diff/$uuid-diff.html