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

Include the kdiff3 executable
author Chris Cannam
date Mon, 17 Dec 2018 09:25:11 +0000
parents 2b51235b3cb8
children 1d0a0fce4021
line wrap: on
line diff
--- a/deploy/linux/deploy-deb.sh	Fri Dec 14 17:28:31 2018 +0000
+++ b/deploy/linux/deploy-deb.sh	Mon Dec 17 09:25:11 2018 +0000
@@ -23,6 +23,12 @@
 set -eu
 
 program=EasyMercurial
+kdiff=easyhg-kdiff3
+merge=easyhg-merge.sh
+extdiff=easyhg-extdiff.sh
+
+programs="$program $kdiff $merge $extdiff"
+
 package=easymercurial
 depdir=deploy/linux
 
@@ -35,6 +41,13 @@
     exit
 fi
 
+for p in $programs; do
+    if [ ! -x "$p" ]; then
+        echo "Failed to find executable ./$p, please build and check"
+        exit 2
+    fi
+done
+
 mkdir "$targetdir"
 
 mkdir "$targetdir/DEBIAN"
@@ -43,7 +56,7 @@
 
 mkdir -p "$targetdir"/usr/bin "$targetdir"/usr/share/pixmaps "$targetdir"/usr/share/applications "$targetdir"/usr/share/doc/"$package"
 
-cp "$program" "$targetdir"/usr/bin/
+cp $programs "$targetdir"/usr/bin/
 
 cp images/icon/scalable/easyhg-icon.svg "$targetdir"/usr/share/pixmaps/
 cp images/icon/128/easyhg-icon.png "$targetdir"/usr/share/pixmaps/