don't use --value systemctl option

dev
Tom Early 5 years ago
parent 845bb0248f
commit 43563aab70

@ -108,16 +108,21 @@ InstallSystem () {
fi fi
} }
GetState() {
local state=$( systemctl show -p ${1}State $2 )
echo ${state#*=}
}
BaseStatus () { BaseStatus () {
local LoadGate SubGate LoadLink SubLink LoadDTMF SubDTMF LoadAPRS SubAPRS local LoadGate SubGate LoadLink SubLink LoadDTMF SubDTMF LoadAPRS SubAPRS
LoadGate=$( systemctl show -p LoadState --value qngateway ) LoadGate=$( GetState Load qngateway )
SubGate=$( systemctl show -p SubState --value qngateway ) SubGate=$( GetState Sub qngateway )
LoadLink=$( systemctl show -p LoadState --value qnlink ) LoadLink=$( GetState Load qnlink )
SubLink=$( systemctl show -p SubState --value qnlink ) SubLink=$( GetState Sub qnlink )
LoadDTMF=$( systemctl show -p LoadState --value qndtmf ) LoadDTMF=$( GetState Load qndtmf )
SubDTMF=$( systemctl show -p SubState --value qndtmf ) SubDTMF=$( GetState Sub qndtmf )
LoadAPRS=$( systemctl show -p LoadState --value aprsgateway ) LoadAPRS=$( GetState Load aprsgateway )
SubAPRS=$( systemctl show -p SubState --value aprsgateway ) SubAPRS=$( GetState Sub aprsgateway )
if [[ $LoadGate == 'loaded' ]]; then if [[ $LoadGate == 'loaded' ]]; then
if [[ $SubGate == 'running' ]]; then if [[ $SubGate == 'running' ]]; then
GateState='running' GateState='running'
@ -197,8 +202,8 @@ ModuleStatus () {
YSFProcess[$1]="${YSFProcess[$1]}${2}" YSFProcess[$1]="${YSFProcess[$1]}${2}"
fi fi
fi fi
LoadState=$( systemctl show -p LoadState --value ${ModuleProcess[$1]} ) LoadState=$( GetState Load ${ModuleProcess[$1]} )
SubState=$( systemctl show -p SubState --value ${ModuleProcess[$1]} ) SubState=$( GetState Sub ${ModuleProcess[$1]} )
if [[ "$LoadState" == "loaded" ]]; then if [[ "$LoadState" == "loaded" ]]; then
if [[ $SubState == "running" ]]; then if [[ $SubState == "running" ]]; then
ModuleState[$1]='running' ModuleState[$1]='running'
@ -209,8 +214,8 @@ ModuleStatus () {
ModuleState[$1]='not installed' ModuleState[$1]='not installed'
fi fi
if [[ "${MMDVMState[$1]}" != 'EMPTY' ]]; then if [[ "${MMDVMState[$1]}" != 'EMPTY' ]]; then
LoadState=$( systemctl show -p LoadState --value ${MMDVMProcess[$1]} ) LoadState=$( GetState Load ${MMDVMProcess[$1]} )
SubState=$( systemctl show -p SubState --value ${MMDVMProcess[$1]} ) SubState=$( GetState Sub ${MMDVMProcess[$1]} )
if [[ "$LoadState" == "loaded" ]]; then if [[ "$LoadState" == "loaded" ]]; then
if [[ $SubState == "running" ]]; then if [[ $SubState == "running" ]]; then
MMDVMState[$1]='running' MMDVMState[$1]='running'
@ -220,8 +225,8 @@ ModuleStatus () {
else else
MMDVMState[$1]='not installed' MMDVMState[$1]='not installed'
fi fi
LoadState=$( systemctl show -p LoadState --value ${DMRProcess[$1]} ) LoadState=$( GetState Load ${DMRProcess[$1]} )
SubState=$( systemctl show -p SubState --value ${DMRProcess[$1]} ) SubState=$( GetState Sub ${DMRProcess[$1]} )
if [[ "$LoadState" == "loaded" ]]; then if [[ "$LoadState" == "loaded" ]]; then
if [[ $SubState == "running" ]]; then if [[ $SubState == "running" ]]; then
DMRState[$1]='running' DMRState[$1]='running'
@ -231,8 +236,8 @@ ModuleStatus () {
else else
DMRState[$1]='not installed' DMRState[$1]='not installed'
fi fi
LoadState=$( systemctl show -p LoadState --value ${YSFProcess[$1]} ) LoadState=$( GetState Load ${YSFProcess[$1]} )
SubState=$( systemctl show -p SubState --value ${YSFProcess[$1]} ) SubState=$( GetState Sub ${YSFProcess[$1]} )
if [[ "$LoadState" == "loaded" ]]; then if [[ "$LoadState" == "loaded" ]]; then
if [[ $SubState == "running" ]]; then if [[ $SubState == "running" ]]; then
YSFState[$1]='running' YSFState[$1]='running'

Loading…
Cancel
Save

Powered by TurnKey Linux.