From d6fc8d61ec96d892d75b7e525c05719691da9ecf Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 9 Nov 2016 10:26:31 -0200 Subject: Development: fix git-tag syntax --- development.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development.mdwn b/development.mdwn index 49a224c..627c2f1 100644 --- a/development.mdwn +++ b/development.mdwn @@ -31,7 +31,7 @@ Create and upload a new release: Tag the release: - git tag -s $(VERSION) -m "Keyringer $(VERSION)" + git tag -s $VERSION -m "Keyringer $VERSION" Update the debian branch: -- cgit v1.2.3 From 155a801258993371e1de5541407d7606fa8a3354 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 9 Nov 2016 10:31:26 -0200 Subject: Minor ChangeLog styling --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bd3530..304161e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,12 +12,12 @@ Slightly more interactive keyringer_get_file - Updates URLs and static site generation. + Updates URLs and static site generation 2015-03-30 - 0.3.8 - Silvio Rhatto Eliminates hardcoded bash path, reported and fixed by - polynomial (closes https://github.com/rhatto/keyringer/pull/1). + polynomial (closes https://github.com/rhatto/keyringer/pull/1) Rename genpair action and option (#69) -- cgit v1.2.3 From d57c2b7070f148c1bdccdce2527a7ec0bf33278f Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 9 Nov 2016 10:31:32 -0200 Subject: Updates develop docs --- development.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/development.mdwn b/development.mdwn index 627c2f1..3287bb2 100644 --- a/development.mdwn +++ b/development.mdwn @@ -50,6 +50,10 @@ Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/1 lintian --info --display-info --pedantic --color auto \ ../build-area/keyringer_$VERSION*.changes +Then go back to the develop branch: + + git checkout develop + Notes: * `git-import-orig` takes care of running `pristine-tar commit`, of merging of the tag and orig tarball into the upstream branch, and then it merges the result into the debian branch. With the above configuration, it also runs git-dch to do the bulk of the work in `debian/changelog`. -- cgit v1.2.3 From bbdc2a4751137d324771ace36202b97db25a00ca Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 9 Nov 2016 10:59:15 -0200 Subject: Development: minor lintian command change --- development.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/development.mdwn b/development.mdwn index 3287bb2..3a1ed34 100644 --- a/development.mdwn +++ b/development.mdwn @@ -47,8 +47,7 @@ Build the package from the debian Git branch: Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/140697/how-do-i-run-lintian-from-pbuilder-dist)): - lintian --info --display-info --pedantic --color auto \ - ../build-area/keyringer_$VERSION*.changes + lintian --info --display-info --pedantic --color auto build-area/keyringer_$VERSION*.changes Then go back to the develop branch: -- cgit v1.2.3 From ddbb589fde02d3e63798fa8341640a603dd83020 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 9 Nov 2016 11:24:45 -0200 Subject: Adds build-area into .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1f376f0..8948a4c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ www /.ikiwiki /recentchanges /www +build-area -- cgit v1.2.3 From eed89d03f8d6a4fbb94957819495c39f5ace35f3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 9 Nov 2016 16:39:58 -0200 Subject: Manpage: sclip action --- share/man/keyringer.1 | 11 +++++++++++ share/man/keyringer.1.mdwn | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/share/man/keyringer.1 b/share/man/keyringer.1 index 39669b6..74bcf1f 100644 --- a/share/man/keyringer.1 +++ b/share/man/keyringer.1 @@ -240,6 +240,17 @@ password\-store convention. Alias to clip action. .RS .RE +.TP +.B sclip <\f[I]secret\f[]> +Same as clip action, but sleeps five seconds, overwrite clipboard and +exit. +If xdotool is available, it also switchs to the next window using the +alt+Tab shortcut. +This action is useful to be invoked by a custom key combo in a window +manager so it becomes easy to provide keyringer managed passphrases to +other applications such as a web browser. +.RS +.RE .SH CONFIGURATION ACTIONS .TP .B commands diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn index 55ae216..8f024d1 100644 --- a/share/man/keyringer.1.mdwn +++ b/share/man/keyringer.1.mdwn @@ -174,6 +174,12 @@ clip <*secret*> xclip <*secret*> : Alias to clip action. +sclip <*secret*> +: Same as clip action, but sleeps five seconds, overwrite clipboard and exit. If xdotool + is available, it also switchs to the next window using the alt+Tab shortcut. This action + is useful to be invoked by a custom key combo in a window manager so it becomes easy to + provide keyringer managed passphrases to other applications such as a web browser. + # CONFIGURATION ACTIONS commands -- cgit v1.2.3 From 17915bf527081c6329316e166ac900ced1a05c57 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 17 Nov 2016 11:23:01 -0200 Subject: Adds sclip into completions --- lib/keyringer/completions/bash/keyringer | 2 +- lib/keyringer/completions/zsh/_keyringer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer index fc952eb..ccc8fb9 100644 --- a/lib/keyringer/completions/bash/keyringer +++ b/lib/keyringer/completions/bash/keyringer @@ -93,7 +93,7 @@ _keyringer() { recipients) opts="ls edit" ;; - ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|find|mv|cp) + ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|sclip|find|mv|cp) cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash opts="$(bash -c "set -f && export KEYRINGER_CHECK_RECIPIENTS=false && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)" ;; diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer index d4b89b1..ff74933 100644 --- a/lib/keyringer/completions/zsh/_keyringer +++ b/lib/keyringer/completions/zsh/_keyringer @@ -49,7 +49,7 @@ _keyringer() { recipients) compadd "$@" ls edit ;; - ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|find|mv|cp) + ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|sclip|find|mv|cp) words[4]="`echo $words[4] | sed -e "s|^/*||"`" # avoid leading slash compadd "$@" $(KEYRINGER_CHECK_RECIPIENTS=false KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null) ;; -- cgit v1.2.3 From 0aab0dbe67e07de3895d6a9b8a0c67941ae3fe65 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 17 Nov 2016 11:33:29 -0200 Subject: Keyringer 0.4.1 --- ChangeLog | 8 ++++++++ keyringer | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 304161e..45bae61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2016-11-17 - 0.4.1 - Silvio Rhatto + + Adds sclip into completions + + Manpage: sclip action + + Updates develop docs + 2016-11-09 - 0.4.0 - Silvio Rhatto Adopts Semantic Versioning diff --git a/keyringer b/keyringer index a5ecd67..84b25a4 100755 --- a/keyringer +++ b/keyringer @@ -140,7 +140,7 @@ function keyringer_dispatch { # Config NAME="keyringer" -KEYRINGER_VERSION="0.4.0" +KEYRINGER_VERSION="0.4.1" CONFIG_VERSION="0.1" CONFIG_BASE="$HOME/.$NAME" CONFIG="$CONFIG_BASE/config" -- cgit v1.2.3