From 46c7af2935ccc096ba0e93cd1adf575026edf44a Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Feb 2016 11:23:48 +0100 Subject: cac-api: do not fail silently for missinc cac_secrets --- cac-api | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cac-api b/cac-api index 174353c..76a0723 100755 --- a/cac-api +++ b/cac-api @@ -17,8 +17,6 @@ cac_templates_cache=${cac_templates_cache-$HOME/tmp/cac_templates_cache.json} cac_secrets=${cac_secrets-$HOME/.secrets/cac-api} -. "$cac_secrets" >/dev/null 2>&1 || : - cac_api() { __cac_api_cli__command=${1-help} @@ -485,6 +483,20 @@ printf %s $binaryPrefix | tr -d 0 | wc -c )} # +#? +#? cac-api will try to load secrets from $cac_secrets +#? and return with error code 1. +__cac_load_secrets() { + if test -r "$cac_secrets"; then + echo "unable to load secrets from '$cac_secrets'" >&2 + __cac_api_cli__help + return 1 + else + . "$cac_secrets" + fi +} + +__cac_load_secrets case ${run-true} in true) cac_api "$@";; -- cgit v1.2.3