]> sigrok.org Git - sigrok-build.git/commitdiff
Fix firmware and decoder paths in the start scripts (CI)
authorFrank Stettner <redacted>
Fri, 14 Apr 2023 10:46:40 +0000 (12:46 +0200)
committerFrank Stettner <redacted>
Fri, 14 Apr 2023 10:52:58 +0000 (12:52 +0200)
This fixes bug 1159 (https://sigrok.org/bugzilla/show_bug.cgi?id=1159)

ci/macos/sigrok-macos-create-dmg.sh

index e6ece30a7d455a5137d3ebac2f2a07263187f1bc..d52d74b13f3b205a5e67ce31b528137c292cf689 100755 (executable)
@@ -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