diff options
| -rw-r--r-- | net-p2p/deluge-cli/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/deluge-cli/files/deluge_web.in | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index d1b21f2654d8..088e24b17fcf 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -3,7 +3,7 @@ PORTNAME= deluge DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.3.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p python PKGNAMESUFFIX= -cli diff --git a/net-p2p/deluge-cli/files/deluge_web.in b/net-p2p/deluge-cli/files/deluge_web.in index 0b05665bee84..d76c25a3c156 100644 --- a/net-p2p/deluge-cli/files/deluge_web.in +++ b/net-p2p/deluge-cli/files/deluge_web.in @@ -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"} |