From 5a09dea98354d16763a855b409495ee98078ddca Mon Sep 17 00:00:00 2001
From: MrTyton <MrTyton@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:11:05 -0400
Subject: [PATCH] Dockerfile fix?

---
 Dockerfile                  | 31 ++++++++++++++++---------------
 release-versions/latest.txt |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 11cbdea..34fccdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,21 +38,22 @@ RUN mkdir -p /opt/calibre && \
 	python3
 
 RUN echo "**** install calibre ****" && \
- mkdir -p \
-	/opt/calibre && \
- if [ -z ${CALIBRE_RELEASE+x} ]; then \
-	CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
-	| jq -r .tag_name); \
- fi && \
- CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
- CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \
- curl -o \
-	/tmp/calibre-tarball.txz -L \
-	"$CALIBRE_URL" && \
- tar xvf /tmp/calibre-tarball.txz -C \
-	/opt/calibre && \
- /opt/calibre/calibre_postinstall && \
- dbus-uuidgen > /etc/machine-id
+  mkdir -p \
+    /opt/calibre && \
+  if [ -z ${CALIBRE_RELEASE+x} ]; then \
+    CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
+    | jq -r .tag_name); \
+  fi && \
+  CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
+  CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \
+  curl -o \
+    /tmp/calibre-tarball.txz -L \
+    "$CALIBRE_URL" && \
+  tar xvf /tmp/calibre-tarball.txz -C \
+    /opt/calibre && \
+   ls /opt/calibre && \
+  /opt/calibre/calibre_postinstall && \
+  dbus-uuidgen > /etc/machine-id
  
 RUN echo "**** cleanup ****" && \
  apt-get clean && \
diff --git a/release-versions/latest.txt b/release-versions/latest.txt
index 1f8ae44..a42a939 100644
--- a/release-versions/latest.txt
+++ b/release-versions/latest.txt
@@ -1 +1 @@
-v2022.03.25-2
+v2022.03.25-3