transmission: fix directory creation in init script
authorDaniel Golle <daniel@makrotopia.org>
Sun, 5 Jan 2020 09:45:33 +0000 (11:45 +0200)
committerDaniel Golle <daniel@makrotopia.org>
Sun, 5 Jan 2020 09:52:52 +0000 (11:52 +0200)
Things were done in the wrong order, leading to config_dir not being
chown'ed and subdirectories not being created in case of download_dir
being inside config_dir.

Fixes: 609109fa9 ("transmission: add seccomp filter and improve jail")
Reported-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
net/transmission/files/transmission.init

index dc20387298edb3e0195aafb2457564ef9f882964..f63beade4585c8b5656710b83267c1239bbb028d 100644 (file)
@@ -73,18 +73,6 @@ transmission() {
                USE=$((MEM * mem_percentage * 10))
        fi
 
-       [ -d "$download_dir" ] || {
-               mkdir -p "$download_dir"
-               chmod 0755 "$download_dir"
-               [ -z "$user" ] || chown -R "$user:$group" "$download_dir"
-       }
-
-       [ "$incomplete_dir_enabled" = "0" ] || [ -d "$incomplete_dir" ] || {
-               mkdir -p "$incomplete_dir"
-               chmod 0755 "$incomplete_dir"
-               [ -z "$user" ] || chown -R "$user:$group" "$incomplete_dir"
-       }
-
        config_file="$config_dir/settings.json"
        [ -d "$config_dir" ] || {
                mkdir -p "$config_dir"
@@ -97,6 +85,18 @@ transmission() {
                [ -z "$user" ] || chown -R "$user:$group" "$config_dir"
        }
 
+       [ -d "$download_dir" ] || {
+               mkdir -p "$download_dir"
+               chmod 0755 "$download_dir"
+               [ -z "$user" ] || chown -R "$user:$group" "$download_dir"
+       }
+
+       [ "$incomplete_dir_enabled" = "0" ] || [ -d "$incomplete_dir" ] || {
+               mkdir -p "$incomplete_dir"
+               chmod 0755 "$incomplete_dir"
+               [ -z "$user" ] || chown -R "$user:$group" "$incomplete_dir"
+       }
+
        [ "$config_overwrite" = 0 ] || {
 
                echo "{" > "$config_file"