diff options
Diffstat (limited to 'bin/shuffle')
| -rwxr-xr-x | bin/shuffle | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/bin/shuffle b/bin/shuffle index 67c4de9..33f7b95 100755 --- a/bin/shuffle +++ b/bin/shuffle @@ -2,9 +2,9 @@ printhelp() { cat <<EOF -Usage: ${0##*/} [-v VOL] [DIR] +Usage: ${0##*/} [-v VOL] [PATHS...] -Play audio files in DIR (or .) in random order +Play audio files in PATHS (or .) in random order -h Print this help -v VOL Play with volume VOL (default 100) @@ -13,7 +13,7 @@ EOF } printusage() { - printf 'Usage: %s [-v volume] [path]\n' "${0##*/}" + printf 'Usage: %s [-v VOL] [PATHS...]\n' "${0##*/}" exit 1 } @@ -22,7 +22,7 @@ while getopts hv: opt; do case "$opt" in h) printhelp ;; v) - if printf %d "$OPTARG" 2>&1 >/dev/null; then + if printf %d "$OPTARG" >/dev/null 2>&1; then volume="$OPTARG" else printf "%s: invalid number '%s'\n" "${0##*/}" "$OPTARG" @@ -35,18 +35,15 @@ done shift $((OPTIND-1)) -if [ $# -gt 1 ]; then - printusage -elif [ $# -eq 1 ]; then - dir="$1" -else - dir="$(. "${XDG_CONFIG_HOME:-"$HOME"/.config}/user-dirs.dirs" && printf '%s' "$XDG_MUSIC_DIR")" +if [ $# -lt 1 ]; then + # set -- "$(. "${XDG_CONFIG_HOME:-"$HOME"/.config}/user-dirs.dirs" && printf '%s' "$XDG_MUSIC_DIR")" + set -- . fi prev1= prev2= while true; do - file="$(find -L "$dir" -type f \( -name '*.m4a' -o -name '*.opus' \) ! -path "$prev1" ! -path "$prev2" -exec shuf -n1 -e '{}' +)" + file="$(find -L "$@" -type f \( -name '*.m4a' -o -name '*.opus' \) ! -path "$prev1" ! -path "$prev2" -exec shuf -n1 -e '{}' +)" prev1="$prev2" prev2="$file" printf 'Playing %s\n' "${file#$dir/}" |