From ca8f29c15edc244f891a91a473bac936e71b0f68 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 26 Feb 2019 09:43:26 +0200 Subject: [PATCH] simplify listing and fix bug with category names. --- pash | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pash b/pash index 306bc62..8b3bf09 100755 --- a/pash +++ b/pash @@ -37,8 +37,15 @@ pw_show() { pw_list() { shopt -s globstar nullglob - [[ $tree ]] && - printf '%s\n' "pash" + if [[ $tree ]]; then + tree + else + printf '%s\e[4D\e[K\n' **/*.gpg + fi +} + +tree() { + printf '%s\n' "pash" for pwrd in **; do [[ -d $pwrd ]] && @@ -48,17 +55,11 @@ pw_list() { pwrd=${pwrd//[^[:print:]]/^[} pwrd=${pwrd//.gpg} - if [[ -z $tree ]]; then - printf '%s\n' "$pwrd" - - else - printf '%s\n' "${nest//\//│ }├─ ${pwrd##*/}${dir}" - dir= - fi + printf '%s\n' "${nest//\//│ }├─ ${pwrd##*/}${dir}" + dir= done - [[ $tree ]] && - printf '└%s\b┘\n' "${nest//\//──┴}" + printf '└%s\b┘\n' "${nest//\//──┴}" } yn() {