diff --git a/RandomVideo.sh b/RandomVideo.sh index adccde0..8262f18 100755 --- a/RandomVideo.sh +++ b/RandomVideo.sh @@ -10,12 +10,12 @@ fi configfile="~/RandomVideo/config.json" -folder="$($cmdjq -r ".RandomVideo | .folder" $configfile)" -player="$($cmdjq -r ".player" $configfile)" -playerparam="$($cmdjq -r ".playerparam" $configfile)" -pgrepplayer="$($cmdjq -r ".pgrepplayer" $configfile)" +folder="$($cmdjq -r ".RandomVideo | .folder" < $configfile)" +player="$($cmdjq -r ".player" < $configfile)" +playerparam="$($cmdjq -r ".playerparam" < $configfile)" +pgrepplayer="$($cmdjq -r ".pgrepplayer" < $configfile)" -swupgpio="$($cmdjq -r ".swupgpio" $configfile)" +swupgpio="$($cmdjq -r ".swupgpio" < $configfile)" playerfull="$(command -v $player) $playerparam" swupstat="$($(command -v gpio) read $swupgpio)" diff --git a/buzzer.sh b/buzzer.sh index 6608341..6409aa5 100755 --- a/buzzer.sh +++ b/buzzer.sh @@ -10,24 +10,24 @@ fi configfile="~/RandomVideo/config.json" -buzzergpio="$($cmdjq -r ".buzzer | .buzzergpio" $configfile)" -strobegpio="$($cmdjq -r ".buzzer | .strobegpio" $configfile)" -swupgpio="$($cmdjq -r ".swupgpio" $configfile)" -swdowngpio="$($cmdjq -r ".buzzer | .swdowngpio" $configfile)" +buzzergpio="$($cmdjq -r ".buzzer | .buzzergpio" < $configfile)" +strobegpio="$($cmdjq -r ".buzzer | .strobegpio" < $configfile)" +swupgpio="$($cmdjq -r ".swupgpio" < $configfile)" +swdowngpio="$($cmdjq -r ".buzzer | .swdowngpio" < $configfile)" -player="$($cmdjq -r ".player" $configfile)" -playerparam="$($cmdjq -r ".playerparam" $configfile)" -playerloop="$($cmdjq -r ".buzzer | .playerloop" $configfile)" +player="$($cmdjq -r ".player" < $configfile)" +playerparam="$($cmdjq -r ".playerparam" < $configfile)" +playerloop="$($cmdjq -r ".buzzer | .playerloop" < $configfile)" -pgrepplayer="$($cmdjq -r ".pgrepplayer" $configfile)" +pgrepplayer="$($cmdjq -r ".pgrepplayer" < $configfile)" -pollingtime="$($cmdjq -r ".buzzer | .pollingtime" $configfile)" -buzzertimeout="$($cmdjq -r ".buzzer | .buzzertimeout" $configfile)" -strobeduration="$($cmdjq -r ".buzzer | .strobeduration" $configfile)" +pollingtime="$($cmdjq -r ".buzzer | .pollingtime" < $configfile)" +buzzertimeout="$($cmdjq -r ".buzzer | .buzzertimeout" < $configfile)" +strobeduration="$($cmdjq -r ".buzzer | .strobeduration" < $configfile)" -volumetimeout="$($cmdjq -r ".buzzer | .volumetimeout" $configfile)" -volumedelay="$($cmdjq -r ".buzzer | .volumedelay" $configfile)" -volumemax="$($cmdjq -r ".buzzer | .volumemax" $configfile)" +volumetimeout="$($cmdjq -r ".buzzer | .volumetimeout" < $configfile)" +volumedelay="$($cmdjq -r ".buzzer | .volumedelay" < $configfile)" +volumemax="$($cmdjq -r ".buzzer | .volumemax" < $configfile)" playerfull="$(command -v $player) $playerparam" cmdgpio="$(command -v gpio)"