jaromail

commit c4c6c88ce4b04250ff561eea853871624aae3b42
parent 7e869ef0420e4f4ad92456eed959880c7cf3cd6a
Author: Jaromil <jaromil@dyne.org>
Date:   Wed,  6 Jun 2012 20:14:15 +0200

fixes testing a fresh install

Diffstat:
M
install.sh
 | 
4
+++-
M
src/jaro
 | 
10
+++++-----

2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/install.sh b/install.sh
@@ -292,7 +292,9 @@ act "Check the commandline help for a list of commands: jaro -h"
 # OS specific post install rules
 case $OS in
 	GNU)
-	cp src/gnome-keyring/jaro-gnome-keyring $WORKDIR/bin/
+	{ test -r src/gnome-keyring/jaro-gnome-keyring } && {
+	    cp src/gnome-keyring/jaro-gnome-keyring $WORKDIR/bin/
+	}
 	;;
 	MAC)
 	;;
diff --git a/src/jaro b/src/jaro
@@ -188,7 +188,7 @@ TRAPINT() {
 
 lock() {
     func "lock: $1"
-    $WORKDIR/.lbdb/dotlock ${1}
+    $WORKDIR/bin/dotlock ${1}
     case $? in
 	1) error "Cannot lock non existing file: $1"
 	    return 1 ;;
@@ -216,7 +216,7 @@ unlock() {
 	error "Created by $lockpid now $$ is trying to unlock"
 	return 1
     }
-    $WORKDIR/.lbdb/dotlock -u ${=@}
+    $WORKDIR/bin/dotlock -u ${=@}
     if [ $? != 0 ]; then
 	error "Unable to unlock: $1"
 	return 1
@@ -237,7 +237,7 @@ unlink() { # delete a file that we are locking
     (
 	${=rm} ${1}
 	touch ${1}
-	$WORKDIR/.lbdb/dotlock -d -f ${1}
+	$WORKDIR/bin/dotlock -d -f ${1}
 	rm -f ${1}.pid
     ) &!
     return 0
@@ -1051,7 +1051,7 @@ PF_DEST = ""			# clear these vars
 PF_FROM = ""
 PF_RECURSE = yes
 
-# blacklist filters using lbdb
+# blacklist filters
 :0 w:
 * ? \$JARO -l blacklist -q query from:
 zz.blacklist/
@@ -1102,7 +1102,7 @@ EOF
 { INCLUDERC=\$PMSRC/pf-save.rc }
 
 
-# whitelisting filters using lbdb
+# whitelisting filters
 :0 w:
 * ? \$JARO -l whitelist -q query from:
 known/