fixes after a bunch of local tests

Author: drizuid

Dockerfile

@@ -29,6 +29,7 @@ RUN \
     libxi6 \
     libxslt1.1 \
     python3-venv \
+    sqlite3 \
     xdg-utils && \
   echo "**** install calibre-web ****" && \
   if [ -z ${CALIBREWEB_RELEASE+x} ]; then \

Dockerfile.aarch64

@@ -35,6 +35,7 @@ RUN \
     libxi6 \
     libxslt1.1 \
     python3-venv \
+    sqlite3 \
     xdg-utils && \
   echo "**** install calibre-web ****" && \
   if [ -z ${CALIBREWEB_RELEASE+x} ]; then \

root/etc/s6-overlay/s6-rc.d/init-calibre-web-config/run

@@ -5,20 +5,6 @@
 rm -rf /etc/ImageMagick-6/policy.xml
 ln -s /defaults/policy.xml /etc/ImageMagick-6/policy.xml
 
-# handle app.db updates for kepubify and ext binary path
-# borrowed from crocodilestick because it's a better solution than what i was doing
-sqlite3 /config/app.db <<EOS
-    update settings set config_kepubifypath='/usr/bin/kepubify', config_binariesdir='/usr/bin';
-EOS
-
-if [[ $? == 0 ]]
-then
-    echo "Successfully set binary paths in '/config/app.db'!"
-elif [[ $? > 0 ]]
-then
-    echo "Could not set binary paths for '/config/app.db' (see errors above)."
-fi
-
 # create Google drive client_secrets.json file
 if [[ ! -f /config/client_secrets.json ]]; then
     echo "{}" > /config/client_secrets.json
@@ -36,3 +22,21 @@ mkdir -p /app/calibre-web/cps/cache
 lsiown -R abc:abc \
     /config \
     /app/calibre-web/cps/cache
+
+export CALIBRE_DBPATH=/config
+
+if [[ ! -f /config/app.db ]]; then
+  echo "First time run, creating app.db..."
+  cd /app/calibre-web && s6-setuidgid abc python3 /app/calibre-web/cps.py -d > /dev/null 2>&1
+  # handle app.db updates for kepubify and ext binary path
+  # borrowed from crocodilestick because it's a better solution than what i was doing
+  sqlite3 /config/app.db <<EOS
+    update settings set config_kepubifypath='/usr/bin/kepubify' where config_kepubifypath is NULL or LENGTH(config_kepubifypath)=0;
+EOS
+
+  if [[ $? == 0 ]]; then
+    echo "Successfully set kepubify paths in '/config/app.db'!"
+  elif [[ $? > 0 ]]; then
+    echo "Could not set binary paths for '/config/app.db' (see errors above)."
+  fi
+fi