"has" command and correct return codes

[passman.git] / passman

diff --git a/passman b/passman
index daf0730ade1ab5a33fbf38e25d6980cacb4b8326..9d6e4e774e7b3c73f5a2648a27374841395c7044 100755 (executable)
--- a/passman
+++ b/passman
@@ -16,17 +16,35 @@
 
 DB=~/.passmandb
 
-generator()
-{
+generator() {
     gpg --armor --gen-random 1 16 | tr '+/' '-_' | tr -d =
 }
 
-cliper()
-{
+cliper() {
     xclip -in -selection $1
 }
 
+ENTITY=""
+
+finder() {
+    cd $DB
+    result=$(find . -type d -path "*$1*" | while read ent; do
+        [ -e "$ent/passwd" ] || continue
+        echo "$ent" | sed 's#^\./##'
+    done)
+    if [ $(echo "$result" | wc -l) -ne 1 ]; then
+        echo "$result"
+        exit 1
+    fi
+    [ -n "$result" ] || exit 1
+    ENTITY=$result
+    echo "$result"
+}
+
 case "$1" in
+has)
+    finder "$2"
+    ;;
 gen)
     generator
     ;;
@@ -41,23 +59,13 @@ add)
     echo "$passwd" > $DB/$dst/passwd
     ;;
 *)
-    cd $DB
-    result=$(find . -type d -path "*$1*" | while read ent; do
-        [ -e "$ent/passwd" ] || continue
-        echo "$ent" | sed 's#^\./##'
-    done)
-    if [ $(echo "$result" | wc -l) -ne 1 ]; then
-        echo "$result"
-        exit
-    fi
-    [ -n "$result" ] || exit 1
-    echo $result
-    if [ -e "$result"/data ]; then
+    finder "$1"
+    if [ -e "$ENTITY"/data ]; then
         echo -n "Associated data: "
-        cat "$result"/data
+        cat "$ENTITY"/data
     fi
-    perl -ne 'chop and print' "$result"/passwd | cliper clipboard
-    echo $(basename "$result") | perl -ne 'chop and print' | cliper primary
+    perl -ne 'chop and print' "$ENTITY"/passwd | cliper clipboard
+    echo $(basename "$ENTITY") | perl -ne 'chop and print' | cliper primary
     sleep 10
     echo -n | cliper clipboard
     ;;