CVS commit: pkgsrc/audio/snapcast

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul  6 10:02:14 UTC 2022

Modified Files:
        pkgsrc/audio/snapcast: Makefile
        pkgsrc/audio/snapcast/files: snapclient.sh snapserver.sh

Log Message:
snapcast: /var/run is cleared on boot so needs to be created by the rc
script


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/snapcast/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/snapcast/files/snapclient.sh \
    pkgsrc/audio/snapcast/files/snapserver.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/snapcast/Makefile
diff -u pkgsrc/audio/snapcast/Makefile:1.3 pkgsrc/audio/snapcast/Makefile:1.4
--- pkgsrc/audio/snapcast/Makefile:1.3  Sun Jul  3 17:32:04 2022
+++ pkgsrc/audio/snapcast/Makefile      Wed Jul  6 10:02:13 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2022/07/03 17:32:04 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/06 10:02:13 nia Exp $
 
 DISTNAME=      snapcast-0.26.0
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=badaix/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -48,6 +49,8 @@ BUILD_DEFS+=          VARBASE
 
 FILES_SUBST+=          SNAPCLIENT_USER=${SNAPCLIENT_USER}
 FILES_SUBST+=          SNAPCLIENT_GROUP=${SNAPCLIENT_GROUP}
+FILES_SUBST+=          SNAPSERVER_USER=${SNAPSERVER_USER}
+FILES_SUBST+=          SNAPSERVER_GROUP=${SNAPSERVER_GROUP}
 FILES_SUBST+=          VARBASE=${VARBASE}
 
 PKG_GROUPS+=           ${SNAPCLIENT_GROUP}
@@ -56,12 +59,6 @@ PKG_GROUPS+=         ${SNAPSERVER_GROUP}
 PKG_USERS+=            ${SNAPCLIENT_USER}:${SNAPCLIENT_GROUP}
 PKG_USERS+=            ${SNAPSERVER_USER}:${SNAPSERVER_GROUP}
 
-OWN_DIRS_PERMS+=       ${VARBASE}/run/snapclient \
-                       ${SNAPCLIENT_USER} ${SNAPCLIENT_GROUP} 0755
-
-OWN_DIRS_PERMS+=       ${VARBASE}/run/snapserver \
-                       ${SNAPCLIENT_USER} ${SNAPCLIENT_GROUP} 0755
-
 OWN_DIRS_PERMS+=       ${VARBASE}/lib/snapclient \
                        ${SNAPSERVER_USER} ${SNAPSERVER_GROUP} 0755
 

Index: pkgsrc/audio/snapcast/files/snapclient.sh
diff -u pkgsrc/audio/snapcast/files/snapclient.sh:1.1 pkgsrc/audio/snapcast/files/snapclient.sh:1.2
--- pkgsrc/audio/snapcast/files/snapclient.sh:1.1       Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/files/snapclient.sh   Wed Jul  6 10:02:14 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: snapclient.sh,v 1.1 2022/07/03 16:09:15 nia Exp $
+# $NetBSD: snapclient.sh,v 1.2 2022/07/06 10:02:14 nia Exp $
 #
 # PROVIDE: snapclient
 # KEYWORD: shutdown
@@ -16,8 +16,17 @@ rcvar=${name}
 command="@PREFIX@/bin/snapclient"
 command_args="-d"
 pidfile="@VARBASE@/run/snapclient/pid"
-snapclient_user=@SNAPCLIENT_USER@
-snapclient_group=@SNAPCLIENT_GROUP@
+snapclient_user="@SNAPCLIENT_USER@"
+snapclient_group="@SNAPCLIENT_GROUP@"
+start_precmd="snapclient_precmd"
+
+snapclient_precmd()
+{
+       if [ ! -d "@VARBASE@/run/snapclient" ]; then
+               mkdir -p -m 755 "@VARBASE@/run/snapclient"
+               chown @SNAPCLIENT_USER@:@SNAPCLIENT_GROUP@ "@VARBASE@/run/snapclient"
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
Index: pkgsrc/audio/snapcast/files/snapserver.sh
diff -u pkgsrc/audio/snapcast/files/snapserver.sh:1.1 pkgsrc/audio/snapcast/files/snapserver.sh:1.2
--- pkgsrc/audio/snapcast/files/snapserver.sh:1.1       Sun Jul  3 16:09:15 2022
+++ pkgsrc/audio/snapcast/files/snapserver.sh   Wed Jul  6 10:02:14 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: snapserver.sh,v 1.1 2022/07/03 16:09:15 nia Exp $
+# $NetBSD: snapserver.sh,v 1.2 2022/07/06 10:02:14 nia Exp $
 #
 # PROVIDE: snapserver
 # KEYWORD: shutdown
@@ -16,6 +16,15 @@ rcvar=${name}
 command="@PREFIX@/bin/snapserver"
 command_args="-d"
 pidfile="@VARBASE@/run/snapserver/pid"
+start_precmd="snapserver_precmd"
+
+snapserver_precmd()
+{
+       if [ ! -d "@VARBASE@/run/snapserver" ]; then
+               mkdir -p -m 755 "@VARBASE@/run/snapserver"
+               chown @SNAPSERVER_USER@:@SNAPSERVER_GROUP@ "@VARBASE@/run/snapserver"
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"