From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 18 Nov 2010 12:53:54 +0000 (-0200)
Subject: Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/keyringer
X-Git-Tag: 0.2.1~109
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=dcd5a3b7f546fe6934e91e3ce0c1e68a9bbc6a3a;p=keyringer.git

Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/keyringer

Conflicts:

	keyringer
---

dcd5a3b7f546fe6934e91e3ce0c1e68a9bbc6a3a
diff --cc keyringer
index ebd5338,c08a897..2893683
--- a/keyringer
+++ b/keyringer
@@@ -134,8 -134,8 +134,8 @@@ ACTIONS="`dirname $(readlink -f $0)`/sh
  export PREFERENCES="`dirname $CONFIG`/$KEYRING"
  
  # Load functions
- LIB="`dirname $0`/lib/$NAME/functions"
- source $LIB || exit 1
+ LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"
 -source "$LIB"
++source "$LIB" | exit 1
  
  # Setup main configuration and load preferences
  keyringer_config_load