X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fappimage%2Fsigrok-native-appimage;h=25378a935dc2b1106612063aa72c72f26accdb76;hp=6476677683dca91b0b7e27a9c88f09dc8abd9adb;hb=a8115a71953c9ca89bdecee408da0f490c46ce54;hpb=23c1d906f8a2d0bdeb2923bbc318eb52ea142ef1

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index 6476677..25378a9 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -10,17 +10,27 @@
 
 PREFIX=$HOME/sr
 
+APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/out
+
 ARCH=x86_64
 
+########################################################################
+# You usually don't have to change anything below this line
+########################################################################
+
 APP=PulseView
 LOWERAPP=${APP,,} 
 
+export STATIC_FILES=`pwd`/contrib
+
+# Add $APPIMAGEKIT_OUTDIR so we can find all the binaries there.
+export PATH=$APPIMAGEKIT_OUTDIR:$PATH
+
 A="./$APP/$APP.AppDir"
 mkdir -p $A/usr/bin $A/usr/lib $A/usr/share
 cd ./$APP
 
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
-. ./functions.sh
+. ../contrib/functions.sh
 
 ########################################################################
 # Get build products from $PREFIX
@@ -42,7 +52,7 @@ strip usr/lib/*
 # AppRun is the main launcher that gets executed when AppImage is run
 ########################################################################
 
-get_apprun
+cp $APPIMAGEKIT_OUTDIR/AppRun .
 
 ########################################################################
 # Copy desktop and icon file to AppDir for AppRun to pick them up