From: Uwe Hermann <redacted>
Date: Wed, 1 Mar 2017 00:22:35 +0000 (+0100)
Subject: sigrok-native-appimage: Add $APPIMAGEKIT_OUTDIR.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a8115a71953c9ca89bdecee408da0f490c46ce54;p=sigrok-util.git

sigrok-native-appimage: Add $APPIMAGEKIT_OUTDIR.

The script now uses a locally built AppImageKit from $APPIMAGEKIT_OUTDIR.

This avoids having to depend on or trust external sites.
---

diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index 6ea6b9f..25378a9 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -10,11 +10,22 @@
 
 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
@@ -41,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