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

Include the kdiff3 executable

 #!/bin/bash
 
 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
         hg id | sed 's/[+ ].*$//'
     elif [ -d .git ]; then

 if [ ! -x ./appimagetool-x86_64.AppImage ]; then
     echo "Failed to find executable ./appimagetool-x86_64.AppImage, please provide that first"
     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"
 
 if [ -d "$targetdir" ]; then

 mkdir "$targetdir"
 
 mkdir -p "$targetdir"/usr/bin
 mkdir -p "$targetdir"/usr/lib
 
-cp "$program" "$targetdir"/usr/bin/
+cp $programs "$targetdir"/usr/bin/
 
 add_dependencies() {
 
     local binary="$1"
 

         fi
     done
 }
 
 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"
 
 QTDIR=${QTDIR:-}