From: Frank Stettner <redacted>
Date: Fri, 14 Apr 2023 10:46:40 +0000 (+0200)
Subject: Fix firmware and decoder paths in the start scripts (CI)
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7624a4fd69a66b4a9303ed520a9131747580acb2;p=sigrok-build.git

Fix firmware and decoder paths in the start scripts (CI)

This fixes bug 1159 (https://sigrok.org/bugzilla/show_bug.cgi?id=1159)
---

diff --git a/ci/macos/sigrok-macos-create-dmg.sh b/ci/macos/sigrok-macos-create-dmg.sh
index e6ece30..d52d74b 100755
--- a/ci/macos/sigrok-macos-create-dmg.sh
+++ b/ci/macos/sigrok-macos-create-dmg.sh
@@ -106,8 +106,8 @@ cat > $MACOS_DIR/$ARTIFACT_BIN_NAME << EOF
 DIR="\$(dirname "\$0")"
 cd "\$DIR"
 export PYTHONHOME="../Frameworks/Python.framework/Versions/$PYTHON_VERSION"
-export SIGROK_FIRMWARE_DIR="../share/sigrok-firmware"
-export SIGROKDECODE_DIR="../share/libsigrokdecode/decoders"
+export SIGROK_FIRMWARE_PATH="\$SIGROK_FIRMWARE_PATH":../share/sigrok-firmware
+export SIGROKDECODE_PATH="\$SIGROKDECODE_PATH":../share/libsigrokdecode/decoders
 exec ./$ARTIFACT_BIN_NAME.real "\$@"
 EOF
 chmod 755 $MACOS_DIR/$ARTIFACT_BIN_NAME