X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=8d59d08870727d99f07784241470d838c8d50f2f;hb=ebd776722e0fd6dfacc79146c368d148f0e266cb;hp=809b1ac9f897260d95ba1f3e4c79398cc68188d9;hpb=2232cf43eed47ab45c7f39ca66cfbde54a602d59;p=monkeysphere.git diff --git a/src/monkeysphere b/src/monkeysphere index 809b1ac..8d59d08 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -18,7 +18,8 @@ PGRM=$(basename $0) SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"} export SYSSHAREDIR -. "${SYSSHAREDIR}/common" || exit 1 +. "${SYSSHAREDIR}/defaultenv" +. "${SYSSHAREDIR}/common" # sharedir for host functions MSHAREDIR="${SYSSHAREDIR}/m" @@ -86,10 +87,10 @@ check_gpg_sec_key_id() { echo "$gpgSecOut" | cut -d: -f5 ;; *) - echo "Multiple primary secret keys found:" >&2 - echo "$gpgSecOut" | cut -d: -f5 >&2 - echo "Please specify which primary key to use." >&2 - failure + local seckeys=$(echo "$gpgSecOut" | cut -d: -f5) + failure "Multiple primary secret keys found: +$seckeys +Please specify which primary key to use." ;; esac }