From f83f3fd5fb27b4f30136597fdf840e74735e02f8 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 26 Apr 2021 19:27:58 +0100
Subject: [PATCH 1/2] Update repos for qbittorrent-cli

---
 Dockerfile         | 58 +++++++++++++++++++++++-----------------------
 Dockerfile.aarch64 | 58 +++++++++++++++++++++++-----------------------
 Dockerfile.armhf   | 58 +++++++++++++++++++++++-----------------------
 3 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ba9b803..e53cacc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,35 +15,35 @@ XDG_DATA_HOME="/config"
 
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg \
-	python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "**** install packages ****" && \
- if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
- apt-get update && \
- apt-get install -y \
-	p7zip-full \
-	qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
-	geoip-bin \
-	unzip && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "***** add qbitorrent repositories ****" && \
+  apt-get update && \
+  apt-get install -y \
+	  gnupg \
+	  python3 && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+  echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "**** install packages ****" && \
+  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	  QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+	  |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+  fi && \
+  apt-get update && \
+  apt-get install -y \
+	  p7zip-full \
+	  qbittorrent-cli \
+	  qbittorrent-nox=${QBITTORRENT_VERSION} \
+	  unrar \
+	  geoip-bin \
+	  unzip && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+	  /tmp/* \
+	  /var/lib/apt/lists/* \
+	  /var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9cdbdd1..8ffb31c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -15,35 +15,35 @@ XDG_DATA_HOME="/config"
 
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg \
-	python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "**** install packages ****" && \
- if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
- apt-get update && \
- apt-get install -y \
-	p7zip-full \
-	qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
-	geoip-bin \
-	unzip && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "***** add qbitorrent repositories ****" && \
+  apt-get update && \
+  apt-get install -y \
+	  gnupg \
+	  python3 && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+  echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "**** install packages ****" && \
+  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	  QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+	  |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+  fi && \
+  apt-get update && \
+  apt-get install -y \
+	  p7zip-full \
+	  qbittorrent-cli \
+	  qbittorrent-nox=${QBITTORRENT_VERSION} \
+	  unrar \
+	  geoip-bin \
+	  unzip && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+	  /tmp/* \
+	  /var/lib/apt/lists/* \
+	  /var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 73b30b2..ed36f17 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -15,35 +15,35 @@ XDG_DATA_HOME="/config"
 
 # add repo and install qbitorrent
 RUN \
- echo "***** add qbitorrent repositories ****" && \
- apt-get update && \
- apt-get install -y \
-	gnupg \
-	python3 && \
- curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
- echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
- echo "**** install packages ****" && \
- if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
- fi && \
- apt-get update && \
- apt-get install -y \
-	p7zip-full \
-	qbittorrent-cli \
-	qbittorrent-nox=${QBITTORRENT_VERSION} \
-	unrar \
-	geoip-bin \
-	unzip && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+  echo "***** add qbitorrent repositories ****" && \
+  apt-get update && \
+  apt-get install -y \
+	  gnupg \
+	  python3 && \
+  curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
+  apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
+  echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
+  echo "**** install packages ****" && \
+  if [ -z ${QBITTORRENT_VERSION+x} ]; then \
+	  QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+	  |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+  fi && \
+  apt-get update && \
+  apt-get install -y \
+	  p7zip-full \
+	  qbittorrent-cli \
+	  qbittorrent-nox=${QBITTORRENT_VERSION} \
+	  unrar \
+	  geoip-bin \
+	  unzip && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
+	  /tmp/* \
+	  /var/lib/apt/lists/* \
+	  /var/tmp/*
 
 # add local files
 COPY root/ /

From f9483a88b674dc99c49ea1e830d793874979243d Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 26 Apr 2021 19:58:22 +0100
Subject: [PATCH 2/2] Fix indentation

---
 Dockerfile         | 26 +++++++++++++-------------
 Dockerfile.aarch64 | 26 +++++++++++++-------------
 Dockerfile.armhf   | 26 +++++++++++++-------------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e53cacc..6435670 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,8 @@ RUN \
   echo "***** add qbitorrent repositories ****" && \
   apt-get update && \
   apt-get install -y \
-	  gnupg \
-	  python3 && \
+    gnupg \
+    python3 && \
   curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
   echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
@@ -27,23 +27,23 @@ RUN \
   echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "**** install packages ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	  QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	  |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+    QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
   fi && \
   apt-get update && \
   apt-get install -y \
-	  p7zip-full \
-	  qbittorrent-cli \
-	  qbittorrent-nox=${QBITTORRENT_VERSION} \
-	  unrar \
-	  geoip-bin \
-	  unzip && \
+    p7zip-full \
+    qbittorrent-cli \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
+    unrar \
+    geoip-bin \
+    unzip && \
   echo "**** cleanup ****" && \
   apt-get clean && \
   rm -rf \
-	  /tmp/* \
-	  /var/lib/apt/lists/* \
-	  /var/tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8ffb31c..7032b7e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,8 +18,8 @@ RUN \
   echo "***** add qbitorrent repositories ****" && \
   apt-get update && \
   apt-get install -y \
-	  gnupg \
-	  python3 && \
+    gnupg \
+    python3 && \
   curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
   echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
@@ -27,23 +27,23 @@ RUN \
   echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "**** install packages ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	  QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	  |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+    QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
   fi && \
   apt-get update && \
   apt-get install -y \
-	  p7zip-full \
-	  qbittorrent-cli \
-	  qbittorrent-nox=${QBITTORRENT_VERSION} \
-	  unrar \
-	  geoip-bin \
-	  unzip && \
+    p7zip-full \
+    qbittorrent-cli \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
+    unrar \
+    geoip-bin \
+    unzip && \
   echo "**** cleanup ****" && \
   apt-get clean && \
   rm -rf \
-	  /tmp/* \
-	  /var/lib/apt/lists/* \
-	  /var/tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index ed36f17..8435ffc 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,8 +18,8 @@ RUN \
   echo "***** add qbitorrent repositories ****" && \
   apt-get update && \
   apt-get install -y \
-	  gnupg \
-	  python3 && \
+    gnupg \
+    python3 && \
   curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
   apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
   echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
@@ -27,23 +27,23 @@ RUN \
   echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
   echo "**** install packages ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-	  QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
-	  |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
+    QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
+    |grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
   fi && \
   apt-get update && \
   apt-get install -y \
-	  p7zip-full \
-	  qbittorrent-cli \
-	  qbittorrent-nox=${QBITTORRENT_VERSION} \
-	  unrar \
-	  geoip-bin \
-	  unzip && \
+    p7zip-full \
+    qbittorrent-cli \
+    qbittorrent-nox=${QBITTORRENT_VERSION} \
+    unrar \
+    geoip-bin \
+    unzip && \
   echo "**** cleanup ****" && \
   apt-get clean && \
   rm -rf \
-	  /tmp/* \
-	  /var/lib/apt/lists/* \
-	  /var/tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /