Use git checkout instead of file copies to clean

12 files changed, 12 insertions, 12 deletions

diff --git a/deployment/Dockerfile.debian.amd64 b/deployment/Dockerfile.debian.amd64
index b5a038048..ea2aba5a8 100644
--- a/deployment/Dockerfile.debian.amd64
+++ b/deployment/Dockerfile.debian.amd64
@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 git
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
diff --git a/deployment/Dockerfile.debian.arm64 b/deployment/Dockerfile.debian.arm64
index cfe562df3..db8485b43 100644
--- a/deployment/Dockerfile.debian.arm64
+++ b/deployment/Dockerfile.debian.arm64
@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
diff --git a/deployment/Dockerfile.debian.armhf b/deployment/Dockerfile.debian.armhf
index ea8c8c8e6..717bc3c89 100644
--- a/deployment/Dockerfile.debian.armhf
+++ b/deployment/Dockerfile.debian.armhf
@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
diff --git a/deployment/Dockerfile.ubuntu.amd64 b/deployment/Dockerfile.ubuntu.amd64
index e61be4efc..7c2b26ded 100644
--- a/deployment/Dockerfile.ubuntu.amd64
+++ b/deployment/Dockerfile.ubuntu.amd64
@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0 git
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
diff --git a/deployment/Dockerfile.ubuntu.arm64 b/deployment/Dockerfile.ubuntu.arm64
index e34ef7edd..27f8ec11b 100644
--- a/deployment/Dockerfile.ubuntu.arm64
+++ b/deployment/Dockerfile.ubuntu.arm64
@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
diff --git a/deployment/Dockerfile.ubuntu.armhf b/deployment/Dockerfile.ubuntu.armhf
index 6f92c81ab..c888c42df 100644
--- a/deployment/Dockerfile.ubuntu.armhf
+++ b/deployment/Dockerfile.ubuntu.armhf
@@ -12,7 +12,7 @@ ENV IS_DOCKER=YES
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv git
 
 # Install dotnet repository
 # https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
diff --git a/deployment/build.debian.amd64 b/deployment/build.debian.amd64
index 0eb9ee5c8..8e205867b 100755
--- a/deployment/build.debian.amd64
+++ b/deployment/build.debian.amd64
@@ -21,7 +21,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    mv debian/control.orig debian/control
+    git checkout debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 
diff --git a/deployment/build.debian.arm64 b/deployment/build.debian.arm64
index d1ce85e2f..436602d19 100755
--- a/deployment/build.debian.arm64
+++ b/deployment/build.debian.arm64
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    mv debian/control.orig debian/control
+    git checkout debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 
diff --git a/deployment/build.debian.armhf b/deployment/build.debian.armhf
index 394158354..9ca57b1e4 100755
--- a/deployment/build.debian.armhf
+++ b/deployment/build.debian.armhf
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    mv debian/control.orig debian/control
+    git checkout debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 
diff --git a/deployment/build.ubuntu.amd64 b/deployment/build.ubuntu.amd64
index 86653cb38..2b789cc47 100755
--- a/deployment/build.ubuntu.amd64
+++ b/deployment/build.ubuntu.amd64
@@ -21,7 +21,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    mv debian/control.orig debian/control
+    git checkout debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 
diff --git a/deployment/build.ubuntu.arm64 b/deployment/build.ubuntu.arm64
index f06517009..9b4e54850 100755
--- a/deployment/build.ubuntu.arm64
+++ b/deployment/build.ubuntu.arm64
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    mv debian/control.orig debian/control
+    git checkout debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi
 
diff --git a/deployment/build.ubuntu.armhf b/deployment/build.ubuntu.armhf
index 679fde5ae..59912a14f 100755
--- a/deployment/build.ubuntu.armhf
+++ b/deployment/build.ubuntu.armhf
@@ -22,7 +22,7 @@ mkdir -p ${ARTIFACT_DIR}/
 mv ../jellyfin[-_]* ${ARTIFACT_DIR}/
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    mv debian/control.orig debian/control
+    git checkout debian/control
     chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}
 fi