From edbc2e050566f7a7882490f1e83d457eb8d6e945 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Wed, 1 Sep 2021 23:35:38 +1200
Subject: [PATCH] Deb: fix libjpeg-turbo build

---
 builder/build-deb-inside-docker |  2 +-
 builder/build-tarball           | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker
index a74287c..734b846 100755
--- a/builder/build-deb-inside-docker
+++ b/builder/build-deb-inside-docker
@@ -24,7 +24,7 @@ if [ "$BUILD_TAG" = "+libjpeg-turbo_latest" ]; then
    echo 'libjpeg 62 libjpeg-turbo (>= 2.1.1)' > debian/shlibs.local
 
    debian_revision="$(echo $BUILD_TAG | tr _ -)"
-   sed -i -e "1 s/)/$debian_revision)/p" debian/changelog
+   sed -i -e "1 s/)/$debian_revision)/" debian/changelog
 fi
 
 dpkg-buildpackage -us -uc -b
diff --git a/builder/build-tarball b/builder/build-tarball
index 41b4375..3a85a8e 100755
--- a/builder/build-tarball
+++ b/builder/build-tarball
@@ -12,6 +12,13 @@ build_www_dir() {
   fi
 }
 
+move_libjpeg_turbo_to_os_specific_dir() {
+  chown $L_UID:$L_GID $shared_with_docker_dir/${os_codename}/*
+  mkdir -p $PWD/builder/build/${os_codename}/
+  mv $shared_with_docker_dir/${os_codename}/libjpeg-turbo*.deb \
+    $PWD/builder/build/${os_codename}/
+}
+
 shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp}
 
 cd "$(dirname "$0")/.."
@@ -35,7 +42,5 @@ mv $shared_with_docker_dir/$tarball_name \
   $PWD/builder/build/"$tarball_name_with_build_tag"
 
 if [ "$build_tag" = "+libjpeg-turbo_latest" ]; then
-  chown $L_UID:$L_GID $shared_with_docker_dir/${os_codename}/*
-  mv $shared_with_docker_dir/${os_codename}/*.deb \
-    $PWD/builder/build/${os_codename}/
+  move_libjpeg_turbo_to_os_specific_dir
 fi