@@ -427,23 +427,21 @@ More info on GitHub:
427
427
https://github.com/marioortizmanero/polybar-pulseaudio-control"
428
428
}
429
429
430
- while [[ " $1 " = --* ]]; do
431
- unset arg
432
- unset val
430
+ function getArgVal() {
433
431
if [[ " $1 " = * = * ]]; then
434
- arg=" ${1// =*/ } "
435
432
val=" ${1//* =/ } "
436
- shift
437
433
else
438
- arg=" $1 "
439
- # Support space-separated values, but also value-less flags
440
- if [[ " $2 " != --* ]]; then
441
- val=" $2 "
442
- shift
443
- fi
434
+ val=" $2 "
444
435
shift
445
436
fi
437
+ }
446
438
439
+ # Parsing the options from the arguments
440
+ while [[ " $1 " = --* ]]; do
441
+ unset arg
442
+ unset val
443
+
444
+ arg=" $1 "
447
445
case " $arg " in
448
446
--autosync)
449
447
AUTOSYNC=yes
@@ -452,6 +450,7 @@ while [[ "$1" = --* ]]; do
452
450
AUTOSYNC=no
453
451
;;
454
452
--color-muted|--colour-muted)
453
+ getArgVal " $@ "
455
454
COLOR_MUTED=" %{F#$val }"
456
455
;;
457
456
--notifications)
@@ -467,31 +466,40 @@ while [[ "$1" = --* ]]; do
467
466
OSD=no
468
467
;;
469
468
--icon-muted)
469
+ getArgVal " $@ "
470
470
ICON_MUTED=" $val "
471
471
;;
472
472
--icon-sink)
473
+ getArgVal " $@ "
473
474
# shellcheck disable=SC2034
474
475
ICON_SINK=" $val "
475
476
;;
476
477
--icons-volume)
478
+ getArgVal " $@ "
477
479
IFS=, read -r -a ICONS_VOLUME <<< " ${val//[[:space:]]/}"
478
480
;;
479
481
--volume-max)
482
+ getArgVal " $@ "
480
483
VOLUME_MAX=" $val "
481
484
;;
482
485
--volume-step)
486
+ getArgVal " $@ "
483
487
VOLUME_STEP=" $val "
484
488
;;
485
489
--sink-blacklist)
490
+ getArgVal " $@ "
486
491
IFS=, read -r -a SINK_BLACKLIST <<< " ${val//[[:space:]]/}"
487
492
;;
488
493
--sink-nicknames-from)
494
+ getArgVal " $@ "
489
495
SINK_NICKNAMES_PROP=" $val "
490
496
;;
491
497
--sink-nickname)
498
+ getArgVal " $@ "
492
499
SINK_NICKNAMES[" ${val//:*/ } " ]=" ${val//*: } "
493
500
;;
494
501
--format)
502
+ getArgVal " $@ "
495
503
FORMAT=" $val "
496
504
;;
497
505
# Undocumented because the `help` action already exists, but makes the
@@ -505,8 +513,10 @@ while [[ "$1" = --* ]]; do
505
513
exit 1
506
514
;;
507
515
esac
516
+ shift
508
517
done
509
518
519
+ # Parsing the action from the arguments
510
520
case " $1 " in
511
521
up)
512
522
volUp
@@ -538,6 +548,9 @@ case "$1" in
538
548
help)
539
549
usage
540
550
;;
551
+ " " )
552
+ echo " No action specified. Run \` $0 help\` for more information." >&2
553
+ ;;
541
554
* )
542
555
echo " Unrecognised action: $1 " >&2
543
556
exit 1
0 commit comments