@@ -427,13 +427,14 @@ More info on GitHub:
427
427
https://github.com/marioortizmanero/polybar-pulseaudio-control"
428
428
}
429
429
430
- function getArgVal() {
430
+ # Obtains the value for an option and returns 1 if no shift is needed.
431
+ function getOptVal() {
431
432
if [[ " $1 " = * = * ]]; then
432
433
val=" ${1//* =/ } "
433
- else
434
- val=" $2 "
435
- shift
434
+ return 1
436
435
fi
436
+
437
+ val=" $2 "
437
438
}
438
439
439
440
# Parsing the options from the arguments
@@ -450,7 +451,7 @@ while [[ "$1" = --* ]]; do
450
451
AUTOSYNC=no
451
452
;;
452
453
--color-muted|--colour-muted)
453
- getArgVal " $@ "
454
+ if getOptVal " $@ " ; then shift ; fi
454
455
COLOR_MUTED=" %{F#$val }"
455
456
;;
456
457
--notifications)
@@ -466,40 +467,40 @@ while [[ "$1" = --* ]]; do
466
467
OSD=no
467
468
;;
468
469
--icon-muted)
469
- getArgVal " $@ "
470
+ if getOptVal " $@ " ; then shift ; fi
470
471
ICON_MUTED=" $val "
471
472
;;
472
473
--icon-sink)
473
- getArgVal " $@ "
474
+ if getOptVal " $@ " ; then shift ; fi
474
475
# shellcheck disable=SC2034
475
476
ICON_SINK=" $val "
476
477
;;
477
478
--icons-volume)
478
- getArgVal " $@ "
479
+ if getOptVal " $@ " ; then shift ; fi
479
480
IFS=, read -r -a ICONS_VOLUME <<< " ${val//[[:space:]]/}"
480
481
;;
481
482
--volume-max)
482
- getArgVal " $@ "
483
+ if getOptVal " $@ " ; then shift ; fi
483
484
VOLUME_MAX=" $val "
484
485
;;
485
486
--volume-step)
486
- getArgVal " $@ "
487
+ if getOptVal " $@ " ; then shift ; fi
487
488
VOLUME_STEP=" $val "
488
489
;;
489
490
--sink-blacklist)
490
- getArgVal " $@ "
491
+ if getOptVal " $@ " ; then shift ; fi
491
492
IFS=, read -r -a SINK_BLACKLIST <<< " ${val//[[:space:]]/}"
492
493
;;
493
494
--sink-nicknames-from)
494
- getArgVal " $@ "
495
+ if getOptVal " $@ " ; then shift ; fi
495
496
SINK_NICKNAMES_PROP=" $val "
496
497
;;
497
498
--sink-nickname)
498
- getArgVal " $@ "
499
+ if getOptVal " $@ " ; then shift ; fi
499
500
SINK_NICKNAMES[" ${val//:*/ } " ]=" ${val//*: } "
500
501
;;
501
502
--format)
502
- getArgVal " $@ "
503
+ if getOptVal " $@ " ; then shift ; fi
503
504
FORMAT=" $val "
504
505
;;
505
506
# Undocumented because the `help` action already exists, but makes the
0 commit comments