Simplify setup for new users

Backport support for /usr/local/etc/acts.conf as default config location
Remove ionice reference from sample config file
This commit is contained in:
Mark Felder 2015-05-13 15:07:34 +00:00
parent e3ec062317
commit b25dd9b3ce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=386223
2 changed files with 19 additions and 0 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= acts
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= sysutils archivers
MAINTAINER= feld@FreeBSD.org
@ -15,6 +16,9 @@ GH_ACCOUNT= alexjurkiewicz
NO_BUILD= yes
post-patch:
${REINPLACE_CMD} 's|ionice -c3 ||' ${WRKSRC}/acts.conf
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}/${PREFIX}/bin/acts
${INSTALL_DATA} ${WRKSRC}/acts.conf ${STAGEDIR}/${PREFIX}/etc/acts.conf.sample

View File

@ -0,0 +1,15 @@
--- acts.orig 2014-12-24 00:50:43 UTC
+++ acts
@@ -31,8 +31,11 @@ if [ -f acts.conf ] ; then
elif [ -f /etc/acts.conf ] ; then
. /etc/acts.conf
log_debug "Loaded /etc/acts.conf"
+elif [ -f /usr/local/etc/acts.conf ] ; then
+ . /usr/local/etc/acts.conf
+ log_debug "Loaded /usr/local/etc/acts.conf"
else
- log_message "No $(pwd)/acts.conf or /etc/acts.conf! Exiting."
+ log_message "No $(pwd)/acts.conf, /etc/acts.conf or /usr/local/etc/acts.conf! Exiting."
exit 1
fi
# Use default values if anything is not set