1 |
commit: dc07b1d0d385c21c2d8ea848e563b3c4a6c2ef7b |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 6 22:11:07 2016 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 6 22:14:04 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc07b1d0 |
7 |
|
8 |
net-p2p/transmission: Don't clobber download directory setting |
9 |
|
10 |
Bug: https://bugs.gentoo.org/576640 |
11 |
|
12 |
Package-Manager: portage-2.2.27_p64 |
13 |
|
14 |
.../files/transmission-daemon.initd.10 | 23 ++++++++++++++-------- |
15 |
...ion-2.90.ebuild => transmission-2.90-r1.ebuild} | 0 |
16 |
2 files changed, 15 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.10 b/net-p2p/transmission/files/transmission-daemon.initd.10 |
19 |
index 7acb222..e1a7150 100644 |
20 |
--- a/net-p2p/transmission/files/transmission-daemon.initd.10 |
21 |
+++ b/net-p2p/transmission/files/transmission-daemon.initd.10 |
22 |
@@ -20,20 +20,27 @@ runas_user=${runas_user:-transmission:transmission} |
23 |
retry="TERM/45/QUIT/15" |
24 |
|
25 |
start_pre() { |
26 |
- command_args=" |
27 |
- --config-dir ${config_dir} |
28 |
- --download-dir ${download_dir} |
29 |
- --pid-file ${pidfile} |
30 |
- ${TRANSMISSION_OPTIONS} |
31 |
- " |
32 |
+ command_args="--config-dir ${config_dir} --pid-file ${pidfile}" |
33 |
command_user="${runas_user}" |
34 |
|
35 |
- checkpath -d -o ${runas_user} "${rundir}" /var/lib/transmission "${config_dir}" "${download_dir}" || return |
36 |
+ # Call mkdir -p in case parent dirs are missing |
37 |
+ mkdir -p "${rundir}" "${config_dir}" "${download_dir}" |
38 |
+ |
39 |
+ # Call checkpath to fixup permissions |
40 |
+ checkpath -d -o "${runas_user}" "${rundir}" "${config_dir}" "${download_dir}" || return |
41 |
+ |
42 |
+ if [ ! -e "${config_dir}/settings.json" ]; then |
43 |
+ # Only set download dir if settings don't exist |
44 |
+ # https://bugs.gentoo.org/576640 |
45 |
+ command_args="${command_args} --download-dir ${download_dir}" |
46 |
+ fi |
47 |
|
48 |
if [ "${logfile}" != syslog ]; then |
49 |
- checkpath -d -o ${runas_user} /var/log/transmission || return |
50 |
+ checkpath -d -o "${runas_user}" /var/log/transmission || return |
51 |
command_args="${command_args} --logfile ${logfile}" |
52 |
fi |
53 |
+ |
54 |
+ command_args="${command_args} ${TRANSMISSION_OPTIONS}" |
55 |
} |
56 |
|
57 |
reload() { |
58 |
|
59 |
diff --git a/net-p2p/transmission/transmission-2.90.ebuild b/net-p2p/transmission/transmission-2.90-r1.ebuild |
60 |
similarity index 100% |
61 |
rename from net-p2p/transmission/transmission-2.90.ebuild |
62 |
rename to net-p2p/transmission/transmission-2.90-r1.ebuild |