diff deploy/linux/deploy-appimage.sh @ 725:48e746f45bde

Include the kdiff3 executable

--- a/deploy/linux/deploy-appimage.sh	Fri Dec 14 17:28:31 2018 +0000
+++ b/deploy/linux/deploy-appimage.sh	Mon Dec 17 09:25:11 2018 +0000
@@ -3,6 +3,11 @@
 set -eu
 
 program=EasyMercurial
+kdiff=easyhg-kdiff3
+merge=easyhg-merge.sh
+extdiff=easyhg-extdiff.sh
+
+programs="$program $kdiff $merge $extdiff"
 
 get_id() {
     if [ -d .hg ]; then
@@ -22,6 +27,13 @@
     exit 2
 fi
 
+for p in $programs; do
+    if [ ! -x "$p" ]; then
+        echo "Failed to find executable ./$p, please build and check"
+        exit 2
+    fi
+done
+
 targetdir="${program}.AppDir"
 
 echo "Target dir is $targetdir"
@@ -36,7 +48,7 @@
 mkdir -p "$targetdir"/usr/bin
 mkdir -p "$targetdir"/usr/lib
 
-cp "$program" "$targetdir"/usr/bin/
+cp $programs "$targetdir"/usr/bin/
 
 add_dependencies() {
 
@@ -71,6 +83,7 @@
 }
 
 add_dependencies "$program"
+add_dependencies "$kdiff"
 
 qtplugins="gif icns ico jpeg tga tiff wbmp webp cocoa minimal offscreen xcb"
 qtlibdirs="/usr/lib/x86_64-linux-gnu/qt5 /usr/lib/x86_64-linux-gnu/qt /usr/lib/qt5 /usr/lib/qt"