Tree - rpms/ncid - src.fedoraproject.org

rpms / ncid

Overview Files Commits Branches Forks Releases
Monitoring status:

Bugzilla Assignee:

Fedora:: moceap
EPEL:: sandeen
Files

Commit: be503dd39aa5dbab9977273a5ace7d9dd504d2b1
Blob Blame History Raw
Index: ncid/Fedora/ncid-initmodem.service
===================================================================
--- ncid.orig/Fedora/ncid-initmodem.service
+++ ncid/Fedora/ncid-initmodem.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID client using the InitModem Module
+Documentation:man:ncid-initmodem(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-initmodem
-PIDFile=/var/run/ncid-initmodem.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-initmodem.pid
+ExecStart=/usr/bin/ncid --no-gui --pidfile /run/ncid-initmodem.pid -P ncid-initmodem
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-initmodem.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid-mythtv.service
===================================================================
--- ncid.orig/Fedora/ncid-mythtv.service
+++ ncid/Fedora/ncid-mythtv.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID client using the MythTV Module
+Documentation=man:ncid-mythtv(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-mythtv
-PIDFile=/var/run/ncid-mythtv.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-mythtv.pid
+ExecStart=/usr/bin/ncid --no-gui --pidfile /run/ncid-mythtv.pid -P ncid-mythtv
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-mythtv.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid-notify.service
===================================================================
--- ncid.orig/Fedora/ncid-notify.service
+++ ncid/Fedora/ncid-notify.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID using the NMA Output Module
+Documentation=man:ncid-notify(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-notify
-PIDFile=/var/run/ncid-notify.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-notify.pid
+ExecStart=/usr/bin/ncid --no-gui --pidfile /run/ncid-notify.pid -P ncid-notify
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-notify.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid-page.service
===================================================================
--- ncid.orig/Fedora/ncid-page.service
+++ ncid/Fedora/ncid-page.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID client using the Page Module
+Documentation=man:ncid-page(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-page
-PIDFile=/var/run/ncid-page.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-page.pid
+ExecStart=/usr/bin/ncid --no-gui --pidfile /run/ncid-page.pid -P ncid-page
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-page.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid-samba.service
===================================================================
--- ncid.orig/Fedora/ncid-samba.service
+++ ncid/Fedora/ncid-samba.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID client using the Samba Module
+Documentation=man:ncid-samba(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-samba
-PIDFile=/var/run/ncid-samba.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-samba.pid
+ExecStart=/usr/bin/ncid --no-gui -p /run/ncid-samba.pid -P ncid-samba
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-samba.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid-speak.service
===================================================================
--- ncid.orig/Fedora/ncid-speak.service
+++ ncid/Fedora/ncid-speak.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID client using the Speak Module
+Documentation=man:ncid-speak(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-speak
-PIDFile=/var/run/ncid-speak.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-speak.pid
+ExecStart=/usr/bin/ncid --no-gui --pidfile /run/ncid-speak.pid -P ncid-speak
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-speak.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid-yac.service
===================================================================
--- ncid.orig/Fedora/ncid-yac.service
+++ ncid/Fedora/ncid-yac.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=NCID client using the YAC Module
+Documentation=man:ncid-yac(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=module=ncid-yac
-PIDFile=/var/run/ncid-yac.pid
-ExecStart=/usr/bin/ncid --no-gui -p /var/run/${module}.pid -P $module
-ExecStop=/bin/kill $MAINPID ; /bin/rm -f /var/run/${module}.pid
+PIDFile=/run/ncid-yac.pid
+ExecStart=/usr/bin/ncid --no-gui --pidfile /run/ncid-yac.pid -P ncid-yac
+ExecStop=/bin/kill $MAINPID ; /bin/rm -f /run/ncid-yac.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncid2ncid.service
===================================================================
--- ncid.orig/Fedora/ncid2ncid.service
+++ ncid/Fedora/ncid2ncid.service
@@ -1,13 +1,13 @@
 [Unit]
-Description=NCID to NCID Gateway
+Description=Network Caller ID NCID to NCID Gateway
+Documentation=man:ncid2ncid(8)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=forking
-Environment=prog=ncid2ncid
-PIDFile=/var/run/ncid2ncid.pid
-ExecStart=/usr/bin/ncid2ncid --pidfile /var/run/${prog}.pid
+PIDFile=/run/ncid2ncid.pid
+ExecStart=/usr/bin/ncid2ncid --pidfile /run/ncid2ncid.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/ncidd.service
===================================================================
--- ncid.orig/Fedora/ncidd.service
+++ ncid/Fedora/ncidd.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=NCID server
+Description=Network Caller ID server
+Documentation=man:ncidd(8)
 After=network.target
 
 [Service]
 Type=forking
-Environment=prog=ncidd
-PIDFile=/var/run/ncidd.pid
-ExecStart=/usr/sbin/ncidd --pidfile /var/run/${prog}.pid
+PIDFile=/run/ncidd.pid
+ExecStart=/usr/sbin/ncidd --pidfile /run/ncidd.pid
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
Index: ncid/Fedora/obi2ncid.service
===================================================================
--- ncid.orig/Fedora/obi2ncid.service
+++ ncid/Fedora/obi2ncid.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=NCID OBi gateway
+Documentation=man:obi2ncid(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=prog=obi2ncid
-PIDFile=/var/run/obi2ncid.pid
-ExecStart=/usr/bin/obi2ncid --pidfile /var/run/${prog}.pid
+PIDFile=/run/obi2ncid.pid
+ExecStart=/usr/bin/obi2ncid --pidfile /run/obi2ncid.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/rn2ncid.service
===================================================================
--- ncid.orig/Fedora/rn2ncid.service
+++ ncid/Fedora/rn2ncid.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=Android smart phone app 'Remote Notifier' to NCID gateway
+Documentation=man:rn2ncid(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=prog=rn2ncid
-PIDFile=/var/run/rn2ncid.pid
-ExecStart=/usr/bin/rn2ncid --pidfile /var/run/${prog}.pid
+PIDFile=/run/rn2ncid.pid
+ExecStart=/usr/bin/rn2ncid --pidfile /run/rn2ncid.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/sip2ncid.service
===================================================================
--- ncid.orig/Fedora/sip2ncid.service
+++ ncid/Fedora/sip2ncid.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=SIP to NCID Gateway
+Documentation=man:sip2ncid(8)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=forking
-Environment=prog=sip2ncid
-PIDFile=/var/run/sip2ncid.pid
-ExecStart=/usr/sbin/sip2ncid --pidfile /var/run/${prog}.pid
+PIDFile=/run/sip2ncid.pid
+ExecStart=/usr/sbin/sip2ncid --pidfile /run/sip2ncid.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/wc2ncid.service
===================================================================
--- ncid.orig/Fedora/wc2ncid.service
+++ ncid/Fedora/wc2ncid.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=Whozz Calling Ethernet Link Device to NCID Gateway
+Documentation=man:wc2ncid(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-Environment=prog=wc2ncid
-PIDFile=/var/run/wc2ncid.pid
-ExecStart=/usr/bin/wc2ncid --pidfile /var/run/${prog}.pid
+PIDFile=/run/wc2ncid.pid
+ExecStart=/usr/bin/wc2ncid --pidfile /run/wc2ncid.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/Fedora/yac2ncid.service
===================================================================
--- ncid.orig/Fedora/yac2ncid.service
+++ ncid/Fedora/yac2ncid.service
@@ -1,12 +1,13 @@
 [Unit]
 Description=YAC to NCID Gateway
+Documentation=man:yac2ncid(1)
 Wants=ncidd.service
 After=ncidd.service
 
 [Service]
 Type=simple
-PIDFile=/var/run/yac2ncid
-ExecStart=/usr/bin/yac2ncid
+PIDFile=/run/yac2ncid.pid
+ExecStart=/usr/bin/yac2ncid -p /run/yac2ncid.pid
 
 [Install]
 WantedBy=multi-user.target
Index: ncid/gateway/yac2ncid.sh
===================================================================
--- ncid.orig/gateway/yac2ncid.sh
+++ ncid/gateway/yac2ncid.sh
@@ -20,6 +20,17 @@ ME="$(basename $0)"
 ME="${ME%.sh}"
 MYDIR="$(cd $(dirname $0) && pwd -P)"
 
+while getopts ":p:" opt ; do
+    case $opt in
+    p)
+      PIDFILE=$OPTARG
+      ;;
+    \?)
+      echo "Unknown option: -$OPTARG" >&2
+      ;;
+    esac
+done
+
 ## Workaround for broken trap on TiVo
 ## checking if date is 199?: broken bash
 ## could also test for TiVo: /tvbin/tivoapp
@@ -29,7 +40,7 @@ then
 	PIDFILE=/dev/null
 else
     # trap should be OK
-    PIDFILE=/var/run/yac2ncid.pid
+    PIDFILE=${PIDFILE:-/var/run/yac2ncid.pid}
 
     dienice(){
         if test -f ${PIDFILE}
rpms / ncid

Source Code

Files
