From c0153d551f19d2e0641ebc3c74e52bc988f58e1d Mon Sep 17 00:00:00 2001
From: MrTyton <MrTyton@users.noreply.github.com>
Date: Sat, 26 Mar 2022 10:19:32 -0400
Subject: [PATCH] Permission fixes?

---
 Dockerfile                               | 13 +++++++------
 release-versions/latest.txt              |  2 +-
 root/app/fanficdownload.py               |  2 ++
 root/etc/cont-init.d/90-user-permissions |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5937589..524ac6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,12 +38,7 @@ RUN echo "**** install calibre ****" && \
  apt-get install -y calibre && \
  dbus-uuidgen > /etc/machine-id
  
-RUN echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
-	
+
 RUN echo "**** s6 omsta;; ****" && \
 	set -ex && \
     ARCH=`uname -m` && \
@@ -67,6 +62,12 @@ RUN echo *** Install Packages *** && \
     fi && \
 	python3 -m pip --no-cache-dir install pushbullet.py pillow && \
     ln -s /opt/calibre/calibredb /bin/calibredb
+	
+RUN echo "**** cleanup ****" && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 COPY root/ /
 
diff --git a/release-versions/latest.txt b/release-versions/latest.txt
index ec14c7c..28df56c 100644
--- a/release-versions/latest.txt
+++ b/release-versions/latest.txt
@@ -1 +1 @@
-2022.03.26-05
+2022.03.26-06
diff --git a/root/app/fanficdownload.py b/root/app/fanficdownload.py
index f55aecf..74ab18c 100644
--- a/root/app/fanficdownload.py
+++ b/root/app/fanficdownload.py
@@ -147,6 +147,7 @@ def downloader(args):
                 moving = ""
             except BaseException:
                 # story is not in calibre
+                output += log("\tStory is not in Calibre", 'WARNING', live)
                 cur = url
                 moving = 'cd "{}" && '.format(loc)
             copyfile("/config/personal.ini", "{}/personal.ini".format(loc))
@@ -434,6 +435,7 @@ if __name__ == "__main__":
 
     if not (options.user or options.password):
         raise ValueError("User or Password not given")
+    print(options)
     main(
         options.user,
         options.password,
diff --git a/root/etc/cont-init.d/90-user-permissions b/root/etc/cont-init.d/90-user-permissions
index bd7ffd1..7acbe54 100644
--- a/root/etc/cont-init.d/90-user-permissions
+++ b/root/etc/cont-init.d/90-user-permissions
@@ -5,5 +5,6 @@ usermod -o -u "$PUID" abc
 
 chown -R abc:abc /app
 chown -R abc:abc /config
+chown -R abc:abc /root
 
 chmod +x /app/run.sh
\ No newline at end of file