# HG changeset patch
# User Chris Cannam
# Date 1544610966 0
# Node ID b93d662a12dfad10b4844ea9b548411ea5bbb181
# Parent  bec2618313d8de8c219d67c6080e2676817d989e
Load up appimage builder

diff -r bec2618313d8 -r b93d662a12df deploy/linux/build-and-test-appimage.sh
--- a/deploy/linux/build-and-test-appimage.sh	Wed Dec 12 10:31:13 2018 +0000
+++ b/deploy/linux/build-and-test-appimage.sh	Wed Dec 12 10:36:06 2018 +0000
@@ -11,6 +11,11 @@
     *);;
 esac
 
+if [ ! -x ./appimagetool-x86_64.AppImage ]; then
+    echo "Failed to find executable ./appimagetool-x86_64.AppImage, please provide that first"
+    exit 2
+fi
+
 echo
 echo "Building appimage from revision $current..."
 
@@ -29,6 +34,8 @@
 chmod 600 "$dockerdir"/known_hosts "$dockerdir"/id_dsa_build
 trap "rm $dockerdir/known_hosts $dockerdir/id_dsa_build" 0
 
+cp appimagetool-x86_64.AppImage "$dockerdir/"
+
 dockertag="cannam/easymercurial-appimage-$current"
 
 sudo docker build -t "$dockertag" -f "$dockerdir"/Dockerfile_appimage.gen "$dockerdir"
diff -r bec2618313d8 -r b93d662a12df deploy/linux/docker/Dockerfile_appimage.in
--- a/deploy/linux/docker/Dockerfile_appimage.in	Wed Dec 12 10:31:13 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Wed Dec 12 10:36:06 2018 +0000
@@ -36,6 +36,8 @@
 RUN hg clone -r[[REVISION]] ssh://hg@bitbucket.org/cannam/easyhg
 
 WORKDIR /easyhg
+COPY appimagetool-x86_64.AppImage appimagetool-x86_64.AppImage
+RUN chmod +x appimagetool-x86_64.AppImage
 ENV QTDIR /opt/qt510
 ENV PATH /opt/qt510/bin:$PATH
 RUN qmake -r