From e048905b8b7382f05b5cd3ab2d5b3b5f865e6112 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Thu, 7 Apr 2022 11:41:00 +0300
Subject: [PATCH] Move appimage dry run into buildscripts/appimage.sh like in
 winbuild

---
 buildscripts/appimage.sh          | 6 ++++--
 packages/docker/Dockerfile.bionic | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/buildscripts/appimage.sh b/buildscripts/appimage.sh
index 1b190de0..3a89d941 100755
--- a/buildscripts/appimage.sh
+++ b/buildscripts/appimage.sh
@@ -20,7 +20,9 @@ fi
 
 if [ -f "out/PyBitmessage-${VERSION}.glibc2.15-x86_64.AppImage" ]; then
     echo "Build Successful";
-    echo "Run out/PyBitmessage-${VERSION}.glibc2.15-x86_64.AppImage"
+    echo "Run out/PyBitmessage-${VERSION}.glibc2.15-x86_64.AppImage";
+    out/PyBitmessage-${VERSION}.glibc2.15-x86_64.AppImage -t
 else
-    echo "Build Failed"
+    echo "Build Failed";
+    exit 1
 fi
diff --git a/packages/docker/Dockerfile.bionic b/packages/docker/Dockerfile.bionic
index 60b18c86..3cd24d8f 100644
--- a/packages/docker/Dockerfile.bionic
+++ b/packages/docker/Dockerfile.bionic
@@ -23,12 +23,8 @@ WORKDIR /home/builder/src
 RUN VERSION=$(python setup.py -V) \
    && python setup.py sdist \
    && python setup.py --command-packages=stdeb.command bdist_deb \
-   && dpkg-deb -I deb_dist/pybitmessage_${VERSION}-1_amd64.deb
-
-RUN buildscripts/appimage.sh
-RUN VERSION=$(python setup.py -V) \
-   && out/PyBitmessage-${VERSION}.glibc2.15-x86_64.AppImage \
-   --appimage-extract-and-run -t
+   && dpkg-deb -I deb_dist/pybitmessage_${VERSION}-1_amd64.deb \
+   && buildscripts/appimage.sh
 
 ###############################################################################