From 6aad964a773b0173ab6b346b34c51f3fe1f7c898 Mon Sep 17 00:00:00 2001 From: Jon-William Lewis Date: Tue, 16 Feb 2016 11:27:40 -0600 Subject: [PATCH] fixed list function and install script bugs --- install.sh | 8 +++++--- src/includes/list.sns.sh | 8 +++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index b8b6302..c2b8b59 100755 --- a/install.sh +++ b/install.sh @@ -22,7 +22,9 @@ if [ "$1" == "--uninstall" ]; then exit fi -mkdir build +if [ ! -d ./build ]; then + mkdir build +fi S=build/sns.sh @@ -48,7 +50,7 @@ chmod +x "$S" if [ ! -r "/bin/sns" ]; then sudo cp "$S" "/bin/sns" else - if grep "simple note system" "/bin/sns"; then + if grep -i "simple note system" "/bin/sns" >/dev/null; then sudo rm /bin/sns sudo cp "$S" "/bin/sns" fi @@ -57,7 +59,7 @@ fi if [ ! -r "/usr/share/bash-completion/completions/sns" ]; then sudo cp "src/bash-completion/sns" "/usr/share/bash-completion/completions/sns" else - if grep "simple note system" "/usr/share/bash-completion/completions/sns"; then + if grep -i "simple note system" "/usr/share/bash-completion/completions/sns" >/dev/null; then sudo rm /bin/sns sudo cp "$S" "/bin/sns" fi diff --git a/src/includes/list.sns.sh b/src/includes/list.sns.sh index 5a39dec..75713e2 100644 --- a/src/includes/list.sns.sh +++ b/src/includes/list.sns.sh @@ -1,4 +1,10 @@ +#!/bin/bash function list(){ # This function, given a folder, $NOTE, will list the contents of $NOTE. - ls "$NOTES_DIR/${NOTE%.*}" + cd "$(dirname "$NOTES_DIR/$NOTE")" + find . -type f -name "*$EXT" | while read file; do + printf "%s\n" "$file" + done + + }