Modify rclone configuration file path.

voykugirl · Feb 10, 2020 · 1c2a025 · 1c2a025
1 parent a4bc9fe
commit 1c2a025
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,8 +15,8 @@ FROM p3terx/s6-alpine:latest
 
 LABEL maintainer P3TERX
 
-ENV XDG_CONFIG_HOME=/config \
-    S6_BEHAVIOUR_IF_STAGE2_FAILS=1
+ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=1 \
+    RCLONE_CONFIG=/config/rclone.conf
 
 RUN apk add --no-cache findutils ca-certificates dpkg && \
     curl -fsSL git.io/aria2c.sh | bash && \
@@ -26,6 +26,7 @@ RUN apk add --no-cache findutils ca-certificates dpkg && \
 
 COPY root /
 
-EXPOSE 6800 \
+EXPOSE \
+    6800 \
     6888 \
     6888/udp
diff --git a/root/etc/cont-init.d/18-rclone b/root/etc/cont-init.d/18-rclone
@@ -25,9 +25,9 @@ if [ "$RCLONE" = "enable" ]; then
     apk add -q --no-cache unzip
     curl -fsSL https://rclone.org/install.sh | bash
     cd /config
-    [ ! -e rclone/rclone.conf ] && {
-        mkdir -p rclone
-        touch rclone/rclone.conf
+    [ ! -e rclone/rclone.conf ] || {
+        mv rclone/rclone.conf .
+        rm -rf rclone
     }
     while [ ! -e autoupload.sh ]; do
         echo; echo -e "${INFO} Doanload 'autoupload.sh' ..."