From 85e15b77d9862579078405bdc447ede80049420c Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 23 Oct 2019 20:02:16 +0300 Subject: [PATCH] fix the test script so it works outside flatpak again --- scripts/compile-gschema.py | 0 scripts/test.sh | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 scripts/compile-gschema.py diff --git a/scripts/compile-gschema.py b/scripts/compile-gschema.py old mode 100644 new mode 100755 diff --git a/scripts/test.sh b/scripts/test.sh index 36faa9c..8affac7 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -2,14 +2,17 @@ set -o errexit set -o pipefail +set -x +# $1 Passed by meson and should be the builddir export CARGO_TARGET_DIR="$1/target/" # If this is run inside a flatpak envrironment, append the export the rustc # sdk-extension binaries to the path -if [ -n "/.flatpak-info" ] +if [ -f "/.flatpak-info" ] then export PATH="$PATH:/usr/lib/sdk/rust-stable/bin" + # This assumes its run inside a Builder terminal export CARGO_TARGET_DIR="$BUILDDIR/target/" fi