summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrhatto <rhatto@ratatosk.fluxo.info>2014-03-14 13:52:01 -0300
committerrhatto <rhatto@ratatosk.fluxo.info>2014-03-14 13:52:01 -0300
commit307fadff79b8f725d4ab9e41f270c024c05a0ef9 (patch)
treec886d99b3971042726ae8b9df58cb3f1a4b901a4 /lib
parent36369a8bfb4fd15d70d61cb4af929ac1b94fed70 (diff)
parent04fddd908235729af70447fecf143af9e669abad (diff)
downloadkeyringer-307fadff79b8f725d4ab9e41f270c024c05a0ef9.tar.gz
keyringer-307fadff79b8f725d4ab9e41f270c024c05a0ef9.tar.bz2
Imported Upstream version 0.3.2upstream_keyringer_0.3.2
Diffstat (limited to 'lib')
l---------lib/keyringer/actions/destroy1
-rwxr-xr-xlib/keyringer/functions16
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/keyringer/actions/destroy b/lib/keyringer/actions/destroy
new file mode 120000
index 0000000..c523618
--- /dev/null
+++ b/lib/keyringer/actions/destroy
@@ -0,0 +1 @@
+teardown \ No newline at end of file
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 0b084af..832385e 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -519,14 +519,18 @@ function keyringer_usage {
printf "Keyringer $KEYRINGER_VERSION\n"
printf "Usage: %s <keyring> <action> [arguments]\n\n" "$BASENAME"
- printf "Available actions: \n\n"
- keyringer_show_actions | sed -e 's/^/\t/'
# Display only when not in a keyring context
if [ ! -z "$keyrings" ] && [ -z "$1" ]; then
- printf "\tinit <path> [remote]\n\n" $BASENAME
printf "Available keyrings: %s \n" "$keyrings"
fi
+
+ # Show available actions
+ printf "Available actions: \n\n"
+ if [ ! -z "$keyrings" ] && [ -z "$1" ]; then
+ printf "\tinit <path> [remote]\n" $BASENAME
+ fi
+ keyringer_show_actions | sed -e 's/^/\t/'
}
# Check repository integrity
@@ -707,10 +711,10 @@ function keyringer_check_expiration {
for expiry in `gpg --with-colons --fixed-list-mode --list-keys "$recipient" | grep ^sub | cut -d : -f 7`; do
if [[ "$seconds" -lt "$expiry" ]]; then
not_expired="1"
- fi
- if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
- echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+ if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
+ echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+ fi
fi
done