chore: variable config path

Lustyn · May 1, 2022 · 83423bc · 83423bc
1 parent 1244cee
commit 83423bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/root/etc/cont-init.d/50-magicdrive b/root/etc/cont-init.d/50-magicdrive
@@ -3,14 +3,14 @@
 
 echo "*** checking plexdrive config"
 while [ ! -f "${pd_config}" ] || [ ! -f "${pd_token}" ]; do
-    echo "Waiting for plexdrive config files in /config. Retrying in 30s ..."
+    echo "Waiting for plexdrive config files in ${config_dir}. Retrying in 30s ..."
     echo "RUN: docker exec -it <CONTAINER_NAME> plexdrive_setup"
     sleep 30
 done
 
 echo "*** checking rclone config"
 while [ ! -f "${rclone_config}" ]; do
-    echo "Waiting for rclone config file in /config/rclone.conf. Retrying in 30s ..."
+    echo "Waiting for rclone config file in ${rclone_config}. Retrying in 30s ..."
     echo "RUN: docker exec -it <CONTAINER_NAME> rclone_setup"
     sleep 30
 done
@@ -31,7 +31,7 @@ check_mountpoint "${pd_mountpoint}"
 
 # permissions
 chown -R abc:abc \
-    /config /cache ${pd_mountpoint} ${rclone_mountpoint} ${mfs_mountpoint}
+    ${config_dir} ${pd_mountpoint} ${rclone_mountpoint} ${mfs_mountpoint} /cache
 chown abc:abc /local
 
 # display version

diff --git a/root/usr/local/bin/plexdrive_setup b/root/usr/local/bin/plexdrive_setup
@@ -9,7 +9,7 @@ Setup Plexdrive
 
 if [ -f "${pd_config}" ] || [ -f "${pd_token}" ]; then
   echo "Plexdrive has already been set up."
-  echo "Try again after removing both 'config.json' and 'token.json' in /config."
+  echo "Try again after removing both ${pd_config} and ${pd_token}."
 else
   plexdrive mount $pd_mountpoint $(echo $pd_basic_opts)
 fi
diff --git a/root/usr/local/bin/rclone_setup b/root/usr/local/bin/rclone_setup
@@ -9,7 +9,7 @@ Setup Rclone
 
 if [ -f "${rclone_config}" ]; then
   echo "Rclone has already been set up."
-  echo "Try again after removing 'rclone.conf' in /config."
+  echo "Try again after removing ${rclone_config}."
 else
   read -e -i "${rclone_mountpoint}" -p "Path to encrypted files (press enter if you don't need a subpath): " remote
   rclone config create --all --config "${rclone_config}" "${rclone_remote}" crypt "remote=${remote}"

diff --git a/root/usr/local/bin/variables b/root/usr/local/bin/variables
@@ -19,19 +19,21 @@ waitmount() {
     done
 }
 
-pd_config="/config/config.json"
-pd_token="/config/token.json"
+config_dir="/config"
+
+pd_config="${config_dir}/config.json"
+pd_token="${config_dir}/token.json"
 pd_mountpoint="/enc"
 pd_basic_opts="
 -v 2
---config /config/
+--config ${config_dir}/
 --uid=${PUID:-911}
 --gid=${PGID:-911}
 --umask=0100775
 -o allow_other,direct_io
 "
 
-rclone_config="/config/rclone.conf"
+rclone_config="${config_dir}/rclone.conf"
 rclone_remote="dec:"
 rclone_mountpoint="/dec"
 rclone_basic_opts="