Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Dec 2016 18:48:29 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429565 - in head/net-p2p/couchpotato: . files
Message-ID:  <201612261848.uBQImTNA050809@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Mon Dec 26 18:48:29 2016
New Revision: 429565
URL: https://svnweb.freebsd.org/changeset/ports/429565

Log:
  net-p2p/couchpotato: Provision ETCDIR in rc script, not in package.
  
  CouchPotato creates the config file on first run. If you choose to run
  with a custom user you will want the rc script to provision the ETCDIR
  with the correct ownership.

Modified:
  head/net-p2p/couchpotato/Makefile
  head/net-p2p/couchpotato/files/couchpotato.in
  head/net-p2p/couchpotato/pkg-plist

Modified: head/net-p2p/couchpotato/Makefile
==============================================================================
--- head/net-p2p/couchpotato/Makefile	Mon Dec 26 18:45:01 2016	(r429564)
+++ head/net-p2p/couchpotato/Makefile	Mon Dec 26 18:48:29 2016	(r429565)
@@ -3,6 +3,7 @@
 
 PORTNAME=	couchpotato
 PORTVERSION=	0.0.20161225
+PORTREVISION=	1
 CATEGORIES=	net-p2p python
 
 MAINTAINER=	feld@FreeBSD.org
@@ -29,7 +30,7 @@ GH_PROJECT=	CouchPotatoServer
 GH_TAGNAME=	b538f9a
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${ETCDIR}
+	${MKDIR} ${STAGEDIR}/${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>

Modified: head/net-p2p/couchpotato/files/couchpotato.in
==============================================================================
--- head/net-p2p/couchpotato/files/couchpotato.in	Mon Dec 26 18:45:01 2016	(r429564)
+++ head/net-p2p/couchpotato/files/couchpotato.in	Mon Dec 26 18:48:29 2016	(r429565)
@@ -42,6 +42,9 @@ couch_pre()
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${couchpotato_user} ${pidfile%/*}
 	fi
+	if [ ! -d ${couchpotato_conf%/*} ]; then
+		install -d -o ${couchpotato_user} ${couchpotato_conf%/*}
+	fi
 }
 
 run_rc_command "$1"

Modified: head/net-p2p/couchpotato/pkg-plist
==============================================================================
--- head/net-p2p/couchpotato/pkg-plist	Mon Dec 26 18:45:01 2016	(r429564)
+++ head/net-p2p/couchpotato/pkg-plist	Mon Dec 26 18:48:29 2016	(r429565)
@@ -1005,4 +1005,3 @@
 %%DATADIR%%/package.json
 %%DATADIR%%/requirements-dev.txt
 %%DATADIR%%/version.py
-@dir(nobody,wheel,755) %%ETCDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612261848.uBQImTNA050809>