bin/dbq-dir2sqlite

diff --git a/bin/dbq-dir2sqlite b/bin/dbq-dir2sqlite
index caa3f54c8355bebc6c027d034b3b1354ef435864..3fe2b40a894446b72bea0c400c2d753499949396 100755 (executable)
--- a/bin/dbq-dir2sqlite
+++ b/bin/dbq-dir2sqlite
@@ -107,7 +107,7 @@ done
 #
 #################################################################################
 . "$NB_ROOT/etc/profile" || exit
-cd "$DIR_NAME" || exit
+#cd "$DIR_NAME" || exit
 
 TMP_DIR="/tmp"
 [ -w "/dev/shm" ] && TMP_DIR="/dev/shm"
@@ -118,15 +118,17 @@ for vars in $(dbq a=ls type='!sqlite' out=sh); do
   eval "$vars"
   [ -z "$id" ] && continue
 
-       [ -w "$id.db" ] || continue
+       [ -w "${id}.db" ] || continue
        [ "$VERBOSE" -gt 0 ] && printf '%s : ' "$id"
 
-       dbq2sqlite db="$id" > "$TMP_DB" || continue
-
-       [ "$VERBOSE" -gt 0 -a ! -s "$TMP_DB" ] && echo "failed"
-       [ -s "$TMP_DB" ] || continue
+       dbq2sqlite db="$id" 2>/dev/null > "$TMP_DB" || continue
+  ret=$?
+       if [ ! -s "$TMP_DB" -o "$ret" != "0" ];then
+         [ "$VERBOSE" -gt 0 ] && echo "failed"
+    continue
+  fi
 
-  if [ -z "$(diff -qs "$id.db" "$TMP_DB" &> /dev/null)" ] ; then
+  if [ -z "$(diff -qs "$id.db" "$TMP_DB" 2>/dev/null)" ] ; then
          [ "$VERBOSE" -gt 0 ] && echo "already"
     continue
   fi