shairport: Improve init script.
- Switch to procd. - Fix alsa options. - Fix indentation. - Fix white spaces not being accepted on config values. - Workaround procd missing custom signal. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
parent
f94dce1ab4
commit
9fe5fb73fd
|
@ -1,41 +1,39 @@
|
||||||
#!/bin/sh /etc/rc.common
|
#!/bin/sh /etc/rc.common
|
||||||
|
# Copyright (C) 2013-2014 OpenWrt.org
|
||||||
|
|
||||||
NAME=shairport
|
|
||||||
START=94
|
START=94
|
||||||
|
USE_PROCD=1
|
||||||
SERVICE_DAEMONIZE=1
|
|
||||||
SERVICE_WRITE_PID=1
|
|
||||||
|
|
||||||
AP_PIDDIR=/var/run
|
|
||||||
AP_BIN=/usr/bin/shairport
|
|
||||||
|
|
||||||
append_arg() {
|
append_arg() {
|
||||||
local cfg="$1"
|
local cfg="$1"
|
||||||
local var="$2"
|
local var="$2"
|
||||||
local opt="$3"
|
local opt="$3"
|
||||||
local def="$4"
|
local def="$4"
|
||||||
local val
|
local val
|
||||||
|
|
||||||
config_get val "$cfg" "$var"
|
config_get val "$cfg" "$var"
|
||||||
[ -n "$val" -o -n "$def" ] && append AP_ARGS "$opt ${val:-$def}"
|
[ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
|
||||||
}
|
}
|
||||||
|
|
||||||
append_bool() {
|
append_bool() {
|
||||||
local cfg="$1"
|
local cfg="$1"
|
||||||
local var="$2"
|
local var="$2"
|
||||||
local opt="$3"
|
local opt="$3"
|
||||||
local def="$4"
|
local def="$4"
|
||||||
local val
|
local val
|
||||||
|
|
||||||
config_get_bool val "$cfg" "$var" "$def"
|
config_get_bool val "$cfg" "$var" "$def"
|
||||||
[ "$val" = 1 ] && append AP_ARGS "$opt"
|
[ "$val" = 1 ] && procd_append_param command "$opt"
|
||||||
}
|
}
|
||||||
|
|
||||||
start_instance() {
|
start_instance() {
|
||||||
AP_ARGS=""
|
|
||||||
local cfg="$1"
|
local cfg="$1"
|
||||||
local ao dev
|
local ao dev
|
||||||
|
|
||||||
|
procd_open_instance
|
||||||
|
|
||||||
|
procd_set_param command /usr/bin/shairport
|
||||||
|
|
||||||
append_arg "$cfg" bname "-a" "AirPort"
|
append_arg "$cfg" bname "-a" "AirPort"
|
||||||
append_arg "$cfg" log "-l"
|
append_arg "$cfg" log "-l"
|
||||||
append_arg "$cfg" initbuf "-b" "256"
|
append_arg "$cfg" initbuf "-b" "256"
|
||||||
|
@ -51,41 +49,30 @@ start_instance() {
|
||||||
|
|
||||||
config_get ao "$cfg" audio_output ""
|
config_get ao "$cfg" audio_output ""
|
||||||
if [ "$ao" = "alsa" ]; then
|
if [ "$ao" = "alsa" ]; then
|
||||||
config_get dev "$cfg" output_device ""
|
config_get dev "$cfg" output_dev ""
|
||||||
if [ -n "$dev" ]; then
|
if [ -n "$dev" ]; then
|
||||||
append AP_ARGS "--"
|
procd_append_param command "--"
|
||||||
append_arg "$cfg" output_device "-d"
|
append_arg "$cfg" output_dev "-d"
|
||||||
append_arg "$cfg" mixer_device "-m"
|
append_arg "$cfg" mixer_dev "-m"
|
||||||
append_arg "$cfg" mixer_type "-t"
|
append_arg "$cfg" mixer_type "-t"
|
||||||
append_arg "$cfg" mixer-control "-c"
|
append_arg "$cfg" mixer_control "-c"
|
||||||
append_arg "$cfg" mixer-index "-i"
|
append_arg "$cfg" mixer_index "-i"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SERVICE_PID_FILE=${AP_PIDDIR}/${NAME}_${cfg}.pid
|
procd_close_instance
|
||||||
service_start $AP_BIN $AP_ARGS
|
|
||||||
|
|
||||||
# Check if daemon is running, if not then
|
|
||||||
# re-execute in foreground to display error.
|
|
||||||
sleep 1 && service_check $AP_BIN || \
|
|
||||||
$AP_BIN $AP_ARGS
|
|
||||||
}
|
}
|
||||||
|
|
||||||
stop_instance()
|
service_triggers() {
|
||||||
{
|
procd_add_reload_trigger "shairport"
|
||||||
local cfg="$1"
|
}
|
||||||
|
|
||||||
SERVICE_PID_FILE=${AP_PIDDIR}/${NAME}_${cfg}.pid
|
start_service() {
|
||||||
SERVICE_SIG_STOP="INT"
|
|
||||||
service_stop $AP_BIN
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
config_load shairport
|
config_load shairport
|
||||||
config_foreach start_instance shairport
|
config_foreach start_instance shairport
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop_service() {
|
||||||
config_load shairport
|
# FIXME: workaround until procd supports custom signal
|
||||||
config_foreach stop_instance shairport
|
killall -SIGINT shairport
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue