Page MenuHomeFreeBSD
Files F164227458

D19091.diff
No OneTemporary
Actions

D19091.diff
View Options

Index: head/news/nzbhydra2/Makefile
===================================================================
--- head/news/nzbhydra2/Makefile
+++ head/news/nzbhydra2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nzbhydra2
-DISTVERSION= 2.3.4
+DISTVERSION= 2.3.6
DISTVERSIONSUFFIX= -linux
CATEGORIES= news java
MASTER_SITES= https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -32,7 +32,7 @@
USERS= nzbhydra2
GROUPS= nzbhydra2
-PLIST_FILES= ${DATADIR}/lib/core-2.3.4-exec.jar \
+PLIST_FILES= ${DATADIR}/lib/core-2.3.6-exec.jar \
${DATADIR}/nzbhydra2 \
${DATADIR}/nzbhydra2wrapper.py \
${DATADIR}/changelog.md \
Index: head/news/nzbhydra2/distinfo
===================================================================
--- head/news/nzbhydra2/distinfo
+++ head/news/nzbhydra2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549150850
-SHA256 (nzbhydra2-2.3.4-linux.zip) = 4c999d26886531ddba66d7c8e656da3fba50476abd722d8823d3cd128d8d5132
-SIZE (nzbhydra2-2.3.4-linux.zip) = 61624259
+TIMESTAMP = 1549478817
+SHA256 (nzbhydra2-2.3.6-linux.zip) = e3aef24aac61f9094f80cd7d93821a103058b4410bafe3ec7d183abaf40bd5dc
+SIZE (nzbhydra2-2.3.6-linux.zip) = 61625733
Index: head/news/nzbhydra2/files/nzbhydra2.in
===================================================================
--- head/news/nzbhydra2/files/nzbhydra2.in
+++ head/news/nzbhydra2/files/nzbhydra2.in
@@ -21,7 +21,7 @@
# as wheel.
# nzbhydra2_dir: Directory where nzbhydra lives.
# Default: %%PREFIX%%/share/nzbhydra2
-# nzbhydra2_datafolder: Data directory for nzbhydra (DB, Logs, config)
+# nzbhydra2_data_dir: Data directory for nzbhydra (DB, Logs, config)
# Default: %%PREFIX%%/nzbhydra2
. /etc/rc.subr
@@ -35,14 +35,17 @@
: ${nzbhydra2_user:="nzbhydra2"}
: ${nzbhydra2_group:="nzbhydra2"}
: ${nzbhydra2_dir:="%%PREFIX%%/share/nzbhydra2"}
-: ${nzbhydra2_datafolder:="%%PREFIX%%/nzbhydra2"}
+: ${nzbhydra2_data_dir:="%%PREFIX%%/nzbhydra2"}
pidfile="/var/run/nzbhydra2/nzbhydra2.pid"
command="%%PYTHON_CMD%%"
-command_args="${nzbhydra2_dir}/nzbhydra2wrapper.py --datafolder ${nzbhydra2_datafolder} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%"
+command_args="${nzbhydra2_dir}/nzbhydra2wrapper.py --datafolder ${nzbhydra2_data_dir} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%"
+start_precmd=nzbhydra2_precmd
-start_precmd="prestart"
-prestart() {
+nzbhydra2_precmd()
+{
+ export XDG_CONFIG_HOME=${nzbhydra2_data_dir}
+
if [ -f ${pidfile} ]; then
rm -f ${pidfile}
echo "Removing stale pidfile."
@@ -50,8 +53,8 @@
install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${pidfile%/*}
fi
- if [ ! -d ${nzbhydra2_datadir} ]; then
- install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${nzbhydra2_datadir}
+ if [ ! -d ${nzbhydra2_data_dir} ]; then
+ install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${nzbhydra2_data_dir}
fi
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 30, 8:42 PM (6 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35754941
Default Alt Text
D19091.diff (2 KB)

Event Timeline