From: rysiek <rysiek@example.org>
Date: Fri, 3 Nov 2017 12:36:42 +0000 (-0200)
Subject: keyringer_tree fixed on FreeBSD; also, prettier everywhere else
X-Git-Tag: 0.5.2~8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=497a6302db1000b6b00ef708043c3f86feb14b11;p=keyringer.git

keyringer_tree fixed on FreeBSD; also, prettier everywhere else
---

diff --git a/lib/keyringer/actions/tree b/lib/keyringer/actions/tree
index 7bf173d..a877548 100755
--- a/lib/keyringer/actions/tree
+++ b/lib/keyringer/actions/tree
@@ -5,7 +5,7 @@
 
 # Thanks http://www.centerkey.com/tree/
 function keyringer_tree {
-  ls -R $* | grep ":$" | sed -e 's/:$//' -e 's/[^-][^\/]*\//--/g' -e 's/^/   /' -e 's/-/|/'
+  find $* | sed -e 's/[^-][^\/]*\//|  /g' | sed -r -e 's/\|  ([^|])/|- \1/'
 }
 
 # Load functions
@@ -19,6 +19,11 @@ CWD="`pwd`"
 shift
 ARGS="`echo "$*" | sed -e "s|^/*||"`"
 
+# on *BSD, find expects at least one argument with the path
+if [ "$ARGS" == "" ]; then
+  ARGS="./"
+fi
+
 # Check implementation
 if which tree &> /dev/null; then
   TREE="tree"