From 2c8c67d30760d4ca15afa916c540e18756b0e607 Mon Sep 17 00:00:00 2001 From: Salt Date: Thu, 26 Sep 2019 14:58:36 -0500 Subject: [PATCH] More minor work --- ptgdp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ptgdp b/ptgdp index 5adcf05..2614f82 100755 --- a/ptgdp +++ b/ptgdp @@ -7,8 +7,14 @@ # set -e +# Import user-dirs.dirs +_xdguserdirs="${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" +[ -z "$XDG_MUSIC_DIR" ] && [ -r "$_xdguserdirs" ] && source "$_xdguserdirs" +unset _xdguserdirs # Read-only set-once variables declare -r _name="$(basename -- "$0")" +declare -r _musicdir="${XDG_MUSIC_DIR:-$HOME/Music}" +declare -r _ptgdpmusicdir="$_musicdir/PTGDP Songs" declare -ra _supportedbackends=("mpd") # Options declare -A _config=( @@ -18,9 +24,10 @@ declare _optconfigfile="${XDG_CONFIG_HOME:-$HOME/.config}/${_name}.conf" declare -i _opthelp declare -i _optverbose=0 # Working variables +declare -a _args declare _return -# Helper Functions +# Helper functions log() { # Print a line to the terminal if _optverbose is greater than $2 # $2 defaults to 0 @@ -52,6 +59,9 @@ has() { return 0 } +# More complex helper functions + + # Core program functions printhelp() { cat << EOF @@ -103,6 +113,11 @@ main() { fi done < "$_optconfigfile" fi + # Store arguments + shift $((OPTIND - 1)) + for arg in "$@"; do + _args+=("$arg") + done # Validate critical options ( for backend in ${_supportedbackends[@]}; do