From 76455ef7ca4be49de018bbd672dba7694800efe6 Mon Sep 17 00:00:00 2001 From: Rasmus Steinke Date: Thu, 6 Aug 2015 02:12:09 +0200 Subject: [PATCH] outsourced rofi options to config file --- PKGBUILD/git/.SRCINFO | 20 ------------------- PKGBUILD/git/PKGBUILD | 28 -------------------------- PKGBUILD/git/rofi-pass.install | 8 -------- config.example | 2 +- rofi-pass | 36 +++++++++++++++++++--------------- 5 files changed, 21 insertions(+), 73 deletions(-) delete mode 100644 PKGBUILD/git/.SRCINFO delete mode 100644 PKGBUILD/git/PKGBUILD delete mode 100644 PKGBUILD/git/rofi-pass.install diff --git a/PKGBUILD/git/.SRCINFO b/PKGBUILD/git/.SRCINFO deleted file mode 100644 index 1550e2f..0000000 --- a/PKGBUILD/git/.SRCINFO +++ /dev/null @@ -1,20 +0,0 @@ -pkgbase = rofi-pass-git - pkgdesc = bash script to handle pass storages in a convenient way - pkgver = 5.f4255a9 - pkgrel = 1 - url = https://github.com/carnager/rofi-pass - install = rofi-pass.install - arch = any - license = GPL - makedepends = git - depends = xorg-xprop - depends = wmctrl - depends = rofi-git - depends = pass - depends = xdotool - depends = xclip - source = git+http://git.53280.de/rofi-pass - md5sums = SKIP - -pkgname = rofi-pass-git - diff --git a/PKGBUILD/git/PKGBUILD b/PKGBUILD/git/PKGBUILD deleted file mode 100644 index d0af5c6..0000000 --- a/PKGBUILD/git/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Rasmus Steinke - -pkgname=rofi-pass-git -_pkgname=rofi-pass -pkgver=5.f4255a9 -pkgrel=1 -pkgdesc="bash script to handle pass storages in a convenient way" -arch=('any') -url='https://github.com/carnager/rofi-pass' -license=('GPL') -depends=('xorg-xprop' 'wmctrl' 'rofi-git' 'pass' 'xdotool' 'xclip') - -install=('rofi-pass.install') -makedepends=('git') -source=('git+http://git.53280.de/rofi-pass') - -pkgver() { - cd ${_pkgname} - printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -package() { - cd ${_pkgname} - make DESTDIR="$pkgdir/" \ - PREFIX='/usr' \ - install -} -md5sums=('SKIP') diff --git a/PKGBUILD/git/rofi-pass.install b/PKGBUILD/git/rofi-pass.install deleted file mode 100644 index 8f3c95a..0000000 --- a/PKGBUILD/git/rofi-pass.install +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -post_install() { -echo ' -Global config file is installed in /etc/rofi-pass.conf -To make user modifications copy it to $HOME/.config/rofi-pass/config -' -} -#post_install diff --git a/config.example b/config.example index 8c01a86..84745b4 100644 --- a/config.example +++ b/config.example @@ -25,7 +25,7 @@ type_pass="Alt+3" open_url="Alt+4" copy_name="Alt+c" copy_pass="Alt+Shift+c" -edit="Alt+1" +edit="Alt+9" move="Alt+2" delete="Alt+3" show="Alt+5" diff --git a/rofi-pass b/rofi-pass index 5eedfcb..15f5d41 100755 --- a/rofi-pass +++ b/rofi-pass @@ -58,7 +58,7 @@ xdotool_type() { mainMenu () { HELP="${autotype}: Autotype | ${type_user}: Type User | ${type_pass}: Type Password ${open_url}: Open URL | ${copy_name}: Copy Username | ${copy_pass}: Copy Password | ${show}: Show Entry" - selected_password="$(echo -e "[ Add Entry ]>\n[ Manage Database ]>\n---\n$(list_passwords 2>/dev/null)" | rofi -i -mesg "${HELP}" -dmenu -kb-custom-1 "${autotype}" -kb-custom-2 "${type_user}" -kb-custom-3 "${type_pass}" -kb-custom-4 "${open_url}" -kb-custom-5 "${copy_name}" -kb-custom-6 "${copy_pass}" -kb-custom-7 "${show}" -dmenu -select "$entry" -p "rofi-pass > ")" + selected_password="$(echo -e "[ Add Entry ]>\n[ Manage Database ]>\n---\n$(list_passwords 2>/dev/null)" | _rofi -mesg "${HELP}" -dmenu -kb-custom-1 "${autotype}" -kb-custom-2 "${type_user}" -kb-custom-3 "${type_pass}" -kb-custom-4 "${open_url}" -kb-custom-5 "${copy_name}" -kb-custom-6 "${copy_pass}" -kb-custom-7 "${show}" -dmenu -select "$entry" -p "rofi-pass > ")" rofi_exit=$? if [[ -n $selected_password ]]; then @@ -151,7 +151,7 @@ ${open_url}: Open URL | ${copy_name}: Copy Username | ${copy_pass}: Copy Passwor manageMenu() { HELP="${edit}: Edit Entry | ${move}: Move Entry | ${delete}: Delete Entry" - selected_password="$(echo -e "0 Return to Main Menu\n---\n$(list_passwords 2>/dev/null)" | rofi -i -custom-kb-1 "${edit}" -custom-kb-2 "${move}" -custom-kb-3 "${delete}" -mesg "${HELP}" -dmenu -select "$entry" -p "rofi-pass > ")" + selected_password="$(echo -e "0 Return to Main Menu\n---\n$(list_passwords 2>/dev/null)" | _rofi -custom-kb-1 "${edit}" -custom-kb-2 "${move}" -custom-kb-3 "${delete}" -mesg "${HELP}" -dmenu -select "$entry" -p "rofi-pass > ")" rofi_exit=$? if [[ "${rofi_exit}" -eq 0 && "${selected_password}" != "0 Return to Main Menu" ]]; then showEntry manageMenu; elif [[ "${rofi_exit}" -eq 10 ]]; then manageEntry edit; @@ -167,7 +167,7 @@ manageMenu() { } showEntry () { - menu=$(echo -e "0 Return\n---\n$(pass "$selected_password")" | rofi -i -dmenu -p "> ") + menu=$(echo -e "0 Return\n---\n$(pass "$selected_password")" | _rofi -dmenu -p "> ") if [[ $menu == "0 Return" ]]; then "$1" elif [[ $menu == "" ]]; then exit else @@ -182,11 +182,11 @@ manageEntry () { elif [[ $1 == "move" ]]; then cd "$HOME"/.password-store/"${root}" selected_password2=$(basename "$selected_password" .gpg) - group=$(find -type d -not -iwholename '*.git*' -printf '%d\t%P\n' | sort -r -nk1 | cut -f2- | rofi -dmenu -i -p "Choose Group > ") + group=$(find -type d -not -iwholename '*.git*' -printf '%d\t%P\n' | sort -r -nk1 | cut -f2- | _rofi -dmenu -p "Choose Group > ") pass mv "$selected_password" "${root}"/"${group}"/"${selected_password2}" manageMenu elif [[ "$1" == "delete" ]]; then - ask=$(echo -e "Yes\nNo" | rofi -i -dmenu -p "Are You Sure? >") + ask=$(echo -e "Yes\nNo" | _rofi -dmenu -p "Are You Sure? >") if [[ "$ask" == "Yes" ]]; then pass rm --force "${selected_password}" elif [[ "$ask" == "no" ]]; then @@ -205,7 +205,7 @@ insertPass () { if [[ -z "$domain" ]]; then domain="Empty"; fi if [[ -z "$name" ]]; then name="Empty"; fi - menu=$(echo -e "0 Return to Main Menu\n* Accept Values and Add Password Entry\n---\n1 Name ($name)\n2 URL ($domain)\n3 User ($user)\n4 Password ($pass2)" | rofi -i -dmenu -p "Add Entry > ") + menu=$(echo -e "0 Return to Main Menu\n* Accept Values and Add Password Entry\n---\n1 Name ($name)\n2 URL ($domain)\n3 User ($user)\n4 Password ($pass2)" | _rofi -dmenu -p "Add Entry > ") if [[ $menu == "0 Return to Main Menu" ]]; then mainMenu elif [[ $menu == "" ]]; then exit elif [[ $menu == "* Accept Values and Add Password Entry" ]]; then @@ -214,19 +214,19 @@ insertPass () { else cd "${basedir}" fi - group=$(find -type d -not -iwholename '*.git*' -printf '%d\t%P\n' | sort -r -nk1 | cut -f2- | rofi -i -dmenu -p "Choose Group > ") + group=$(find -type d -not -iwholename '*.git*' -printf '%d\t%P\n' | sort -r -nk1 | cut -f2- | _rofi -dmenu -p "Choose Group > ") if [[ -n "$root" ]]; then pass insert -m -f "${root}/${group}/${name}" < <(echo -e "${pass}\nUserName: ${user}\n---\nURL: ${domain}") else pass insert -m -f "${group}/${name}" < <(echo -e "${pass}\nUserName: ${user}\n---\nURL: ${domain}") fi elif [[ $menu == "1 Name"* ]]; then - name=$(echo "" | rofi -i -dmenu -p "Enter Name > ") + name=$(echo "" | _rofi -dmenu -p "Enter Name > ") insertPass elif [[ $menu == "2 URL"* ]]; then HELP="Enter Domain Name or chose one of the Options below" - domain=$(echo -e "< Return\n---\nGet URL from active Browser Tab" | rofi -i -dmenu -mesg "${HELP}" -p "URL > ") + domain=$(echo -e "< Return\n---\nGet URL from active Browser Tab" | _rofi -dmenu -mesg "${HELP}" -p "URL > ") if [[ $domain == "Get URL from active Browser Tab" ]]; then domain=$($HOME/.config/rofi-pass/parsers/$BROWSER) insertPass @@ -239,7 +239,7 @@ insertPass () { fi elif [[ $menu == "3 User"* ]]; then HELP="Enter Username" - user=$(echo -e "" | rofi -i -dmenu -mesg "${HELP}" -p "Username > ") + user=$(echo -e "" | _rofi -dmenu -mesg "${HELP}" -p "Username > ") insertPass elif [[ $menu == "4 Password"* ]]; then password_length=12 @@ -257,31 +257,35 @@ password_gen () { if [[ $symbols == "True" ]]; then sym="-y"; else sym=""; fi if [[ $numerals == "True" ]]; then num="-n"; else num="-0"; fi HELP="Choose one password or type your own" - menu=$(echo -e "0 Return to Insert Menu\n* Generate new Password\n---\n1 Password Length\n2 Include Capitals ($capitals)\n3 Include Numerals ($numerals)\n4 Include Symbols ($symbols)\n---\n$(pwgen $num $cap $sym -B -1 $password_length 5)" | rofi -i -dmenu -mesg "${HELP}" -p "Password > ") + menu=$(echo -e "0 Return to Insert Menu\n* Generate new Password\n---\n1 Password Length\n2 Include Capitals ($capitals)\n3 Include Numerals ($numerals)\n4 Include Symbols ($symbols)\n---\n$(pwgen $num $cap $sym -B -1 $password_length 5)" | _rofi -dmenu -mesg "${HELP}" -p "Password > ") if [[ $menu == "1 Password Length" ]]; then - password_length=$(echo -e "5\n7\n10\n12\n15\n20" | rofi -i -dmenu -p "Choose Length > ") + password_length=$(echo -e "5\n7\n10\n12\n15\n20" | _rofi -dmenu -p "Choose Length > ") password_gen elif [[ $menu == "0 Return to Insert Menu" ]]; then insertPass elif [[ $menu == "* Generate new Password" ]]; then password_gen elif [[ $menu == "2 Include Capitals"* ]]; then - capitals=$(echo -e "True\nFalse" | rofi -i -dmenu -p "Capitals? > ") + capitals=$(echo -e "True\nFalse" | _rofi -dmenu -p "Capitals? > ") password_gen elif [[ $menu == "3 Include Numerals"* ]]; then - numerals=$(echo -e "True\nFalse" | rofi -i -dmenu -p "Numerals? > ") + numerals=$(echo -e "True\nFalse" | _rofi -dmenu -p "Numerals? > ") password_gen elif [[ $menu == "4 Include Symbols"* ]]; then - symbols=$(echo -e "True\nFalse" | rofi -i -dmenu -p "Symbols? > ") + symbols=$(echo -e "True\nFalse" | _rofi -dmenu -p "Symbols? > ") password_gen else insertPass "$menu" fi } +function _rofi () { + rofi -dmenu -z $(echo "${rofiopts}") "$@" +} + help_msg () { - echo "rofi-pass - a rofi driven frontend to pass" + echo "rofi-pass - a _rofi driven frontend to pass" echo "--------------------------------------" echo "(C) 2015 Rasmus Steinke " echo "(C) 2015 Thore Bödecker "