From fcc0f94031db0b83ba9b2cd85b4b678f6c3f2d5b Mon Sep 17 00:00:00 2001 From: Aoi Koizumi Date: Tue, 3 May 2022 11:43:51 -0300 Subject: Assume $EDITOR was set beforehand, and more reformatting. --- ayu | 65 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/ayu b/ayu index 85fa41b..fe50472 100644 --- a/ayu +++ b/ayu @@ -12,21 +12,20 @@ ayu_store=${ayu_store:-$HOME/.ayu-store} # Check if the above directories exist, otherwise create them for dir in "$ayu_dir" "$ayu_settings" "$ayu_store"; do - test -d "$dir" || mkdir -p "$dir" + test -d "$dir" || mkdir -p "$dir" done # Same thing for the configuration file if ! test -f "$ayu_settings"/config; then - cat << EOF > "$ayu_settings"/config - #ayu_clipboard=$(wl-copy --primary) - #ayu_clipboard=$(xsel -ib) - ayu_private_key=${ayu_dir}/private_key - ayu_public_key=${ayu_dir}/public_key - EDITOR=${EDITOR:-vi} + cat << EOF > "$ayu_settings"/config +#ayu_clipboard=$(wl-copy --primary) +#ayu_clipboard=$(xsel -ib) +ayu_private_key=${ayu_dir}/private_key +ayu_public_key=${ayu_dir}/public_key EOF -. "$ayu_settings"/config + . "$ayu_settings"/config else - . "$ayu_settings"/config + . "$ayu_settings"/config fi # Switch directory to the store, else bail out @@ -35,47 +34,47 @@ cd "$ayu_store" || exit 1 ## THEGOODS ## fn_copy() { - fn_view "$2" | "$ayu_clipboard" + fn_view "$2" | "$ayu_clipboard" } fn_edit() { - age --decrypt --identity="${ayu_private_key}" --output="${1%%.age}" "${1%%.age}.age" - $EDITOR "${1%%.age}" - age --encrypt --recipients-file "${ayu_public_key}" --output="${1%%.age}.age" "${1%%.age}" - rm "${1%%.age}" + age --decrypt --identity="${ayu_private_key}" --output="${1%%.age}" "${1%%.age}.age" + $EDITOR "${1%%.age}" + age --encrypt --recipients-file "${ayu_public_key}" --output="${1%%.age}.age" "${1%%.age}" + rm "${1%%.age}" } fn_list() { - tree "$ayu_store" + tree "$ayu_store" } fn_new() { - test -d "$1" && fn_usage && exit + test -d "$1" && fn_usage && exit - tmpfile="$(mktemp)" - ${EDITOR} "$tmpfile" + tmpfile="$(mktemp)" + ${EDITOR} "$tmpfile" - mkdir -p "$(dirname "$1")" - age --encrypt --recipients-file "${ayu_public_key}" --output="$tmpfile.age" "$tmpfile" + mkdir -p "$(dirname "$1")" + age --encrypt --recipients-file "${ayu_public_key}" --output="$tmpfile.age" "$tmpfile" - mv "$tmpfile.age" "${1%%.age}".age - rm "$tmpfile" + mv "$tmpfile.age" "${1%%.age}".age + rm "$tmpfile" } fn_remove_recursive() { - rm -rf "$@" + rm -rf "$@" } fn_remove_single() { - rm -f "${1}${2}.age" + rm -f "${1}${2}.age" } fn_usage() { - printf "Usage: [ -c | -e | -l | -n | -r | -R | -v ] \n" + printf "Usage: [ -c | -e | -l | -n | -r | -R | -v ] \n" } fn_view() { - if [ -f "${1%%.age}".age ]; then - age --decrypt --identity="${ayu_private_key}" "${1%%.age}.age" - elif [ -d "${1:-.}" ]; then - tree "${1:-.}" - else - fn_usage - exit - fi + if [ -f "${1%%.age}".age ]; then + age --decrypt --identity="${ayu_private_key}" "${1%%.age}.age" + elif [ -d "${1:-.}" ]; then + tree "${1:-.}" + else + fn_usage + exit + fi } ## SDOOGEHT ## -- cgit 1.4.1-2-gfad0