Date: Tue, 23 Apr 2019 09:23:06 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r499738 - in branches/2019Q2/net-p2p/deluge-cli: . files Message-ID: <201904230923.x3N9N6aG048626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Tue Apr 23 09:23:05 2019 New Revision: 499738 URL: https://svnweb.freebsd.org/changeset/ports/499738 Log: MFH: r499737 net-p2p/deluge-cli: fix deluged rc-script PR: 237389 Submitted by: Delan Azabani <delan@azabani.com> Approved by: portmgr (blanket approval) Modified: branches/2019Q2/net-p2p/deluge-cli/Makefile branches/2019Q2/net-p2p/deluge-cli/files/deluge_web.in Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/net-p2p/deluge-cli/Makefile ============================================================================== --- branches/2019Q2/net-p2p/deluge-cli/Makefile Tue Apr 23 09:18:52 2019 (r499737) +++ branches/2019Q2/net-p2p/deluge-cli/Makefile Tue Apr 23 09:23:05 2019 (r499738) @@ -3,7 +3,7 @@ PORTNAME= deluge DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.3.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p python PKGNAMESUFFIX= -cli Modified: branches/2019Q2/net-p2p/deluge-cli/files/deluge_web.in ============================================================================== --- branches/2019Q2/net-p2p/deluge-cli/files/deluge_web.in Tue Apr 23 09:18:52 2019 (r499737) +++ branches/2019Q2/net-p2p/deluge-cli/files/deluge_web.in Tue Apr 23 09:23:05 2019 (r499738) @@ -45,7 +45,7 @@ deluge_web_prestart() if [ "$deluge_web_user" = 'asjklasdfjklasdf' ]; then err 1 "You must set deluge_web_user to a real, unprivileged user" fi - deluge_web_home=$(pw user show ${deluge_web_user} | cut -d : -f 9) + if [ -z ${deluge_web_home} ]; then err 1 "deluge_web_user does not have a valid home directory." fi @@ -60,6 +60,7 @@ deluge_web_prestart() if [ ! -d "${deluge_web_home}/.python-eggs" ]; then mkdir ${deluge_web_home}/.python-eggs chown -R $deluge_web_user ${deluge_web_home}/.python-eggs + fi chmod 0755 /var/run/${name} chown -R $deluge_web_user /var/run/${name} @@ -76,6 +77,9 @@ load_rc_config $name : ${deluge_web_enable:="NO"} : ${deluge_web_user:="asjklasdfjklasdf"} + +deluge_web_home=$(pw user show ${deluge_web_user} | cut -d : -f 9) + : ${deluge_web_confdir:="${deluge_web_home}/.config/deluge"} : ${deluge_web_loglevel:="error"} : ${deluge_web_logfile:="/var/tmp/${name}.log"}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904230923.x3N9N6aG048626>