From f340abb31eb9170e235475a7e690dd043ec52850 Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Sun, 21 Jun 2020 07:12:05 +0100
Subject: [PATCH] updated names of created images add gnu-libiconv-dev to
 alpine build

---
 buildScripts/createAppImage                 |  2 +-
 buildScripts/createDebianPackage            |  2 +-
 buildScripts/createDockerAlpineImageOutside |  2 +-
 buildScripts/createDockerUbuntuImageFromDeb |  2 +-
 buildScripts/getDevLibrariesAlpine          |  1 +
 buildScripts/versionEnvs                    | 10 ++++++++--
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/buildScripts/createAppImage b/buildScripts/createAppImage
index c2e2fa7..1a72152 100755
--- a/buildScripts/createAppImage
+++ b/buildScripts/createAppImage
@@ -16,7 +16,7 @@ set -ev
 # For appimage output plugin
 #
 #export VERSION="$PDF2HTMLEX_BRANCH-$BUILD_TIME"
-export APPIMAGE_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$BUILD_DIST-$MACHINE_ARCH.AppImage"
+export APPIMAGE_NAME="pdf2htmlEX-$PDF2HTMLEX_NAME.AppImage"
 
 echo "export APPIMAGE_NAME=\"$APPIMAGE_NAME\"" >> buildScripts/reSourceVersionEnvs
 
diff --git a/buildScripts/createDebianPackage b/buildScripts/createDebianPackage
index 64b0186..3c47d5f 100755
--- a/buildScripts/createDebianPackage
+++ b/buildScripts/createDebianPackage
@@ -13,7 +13,7 @@ echo ""
 
 set -ev
 
-export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$BUILD_DIST-$MACHINE_ARCH.deb"
+export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_NAME.deb"
 
 echo "export DPKG_NAME=\"$DPKG_NAME\"" >> buildScripts/reSourceVersionEnvs
 
diff --git a/buildScripts/createDockerAlpineImageOutside b/buildScripts/createDockerAlpineImageOutside
index 17af024..ff6fa44 100755
--- a/buildScripts/createDockerAlpineImageOutside
+++ b/buildScripts/createDockerAlpineImageOutside
@@ -45,7 +45,7 @@ if [ -z "$DOCKER_USERNAME" ]; then
   fi
 fi
 
-export DOCKER_NAME="$DOCKER_USERNAME/pdf2htmlex:$PDF2HTMLEX_BRANCH-$BUILD_TIME"
+export DOCKER_NAME="$DOCKER_USERNAME/pdf2htmlex:$PDF2HTMLEX_NAME"
 
 echo "export DOCKER_FROM=\"$DOCKER_FROM\""         >> ../../buildScripts/reSourceVersionEnvs
 echo "export DOCKER_USERNAME=\"$DOCKER_USERNAME\"" >> ../../buildScripts/reSourceVersionEnvs
diff --git a/buildScripts/createDockerUbuntuImageFromDeb b/buildScripts/createDockerUbuntuImageFromDeb
index c2f0af8..c0e4030 100755
--- a/buildScripts/createDockerUbuntuImageFromDeb
+++ b/buildScripts/createDockerUbuntuImageFromDeb
@@ -48,7 +48,7 @@ if [ -z "$DOCKER_USERNAME" ]; then
   fi
 fi
 
-export DOCKER_NAME="$DOCKER_USERNAME/pdf2htmlex:$PDF2HTMLEX_BRANCH-$BUILD_TIME"
+export DOCKER_NAME="$DOCKER_USERNAME/pdf2htmlex:$PDF2HTMLEX_NAME"
 
 echo "export DOCKER_FROM=\"$DOCKER_FROM\""         >> ../../buildScripts/reSourceVersionEnvs
 echo "export DOCKER_USERNAME=\"$DOCKER_USERNAME\"" >> ../../buildScripts/reSourceVersionEnvs
diff --git a/buildScripts/getDevLibrariesAlpine b/buildScripts/getDevLibrariesAlpine
index a8a3c41..f2a6ec2 100755
--- a/buildScripts/getDevLibrariesAlpine
+++ b/buildScripts/getDevLibrariesAlpine
@@ -17,6 +17,7 @@ set -ev
 sudo apk update
 sudo apk add        \
   gettext           \
+  gnu-libiconv-dev  \
   cairo-dev         \
   libpng-dev        \
   freetype-dev      \
diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs
index 637a3b7..00ac4b6 100755
--- a/buildScripts/versionEnvs
+++ b/buildScripts/versionEnvs
@@ -47,8 +47,10 @@ if test -r /etc/lsb-release ; then
   # source /etc/lsb-release
   . /etc/lsb-release
   export BUILD_DIST=$DISTRIB_CODENAME
+  export BUILD_OS=$DISTRIB_ID
 elif test -r /etc/alpine-release ; then
   cat /etc/alpine-release
+  export BUILD_OS=alpine
   export BUILD_DIST=$(cat /etc/alpine-release)
 else
   echo "FAILURE: could not determine release"
@@ -61,11 +63,15 @@ export BUILD_TIME="$(date +%Y_%m_%d-%H_%M_%S)"
 
 export MACHINE_ARCH="$(uname -m)"
 
-echo "export PDF2HTMLEX_VERSION=\"$PDF2HTMLEX_VERSION\"" >  buildScripts/reSourceVersionEnvs
-echo "export POPPLER_VERSION=\"$POPPLER_VERSION\""       >>  buildScripts/reSourceVersionEnvs
+export PDF2HTMLEX_NAME=$PDF2HTMLEX_VERSION-$PDF2HTMLEX_BRANCH-$BUILD_DATE-$BUILD_OS-$BUILD_DIST-$MACHINE_ARCH
+
+echo "export PDF2HTMLEX_NAME=\"$PDF2HTMLEX_NAME\""       >  buildScripts/reSourceVersionEnvs
+echo "export PDF2HTMLEX_VERSION=\"$PDF2HTMLEX_VERSION\"" >> buildScripts/reSourceVersionEnvs
+echo "export POPPLER_VERSION=\"$POPPLER_VERSION\""       >> buildScripts/reSourceVersionEnvs
 echo "export FONTFORGE_VERSION=\"$FONTFORGE_VERSION\""   >> buildScripts/reSourceVersionEnvs
 echo "export PDF2HTMLEX_BRANCH=\"$PDF2HTMLEX_BRANCH\""   >> buildScripts/reSourceVersionEnvs
 echo "export MACHINE_ARCH=\"$MACHINE_ARCH\""             >> buildScripts/reSourceVersionEnvs
+echo "export BUILD_OS=\"$BUILD_OS\""                     >> buildScripts/reSourceVersionEnvs
 echo "export BUILD_DIST=\"$BUILD_DIST\""                 >> buildScripts/reSourceVersionEnvs
 echo "export BUILD_DATE=\"$BUILD_DATE\""                 >> buildScripts/reSourceVersionEnvs
 echo "export BUILD_TIME=\"$BUILD_TIME\""                 >> buildScripts/reSourceVersionEnvs