From: Uwe Hermann <redacted>
Date: Tue, 11 Mar 2014 22:43:20 +0000 (+0100)
Subject: nsis: Fix the "working dir" path for sigrok-cli.
X-Git-Tag: sigrok-cli-0.5.0~27
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=1afa97c57be988585796c2b88a3fcb8f881006b8

nsis: Fix the "working dir" path for sigrok-cli.

For now, start the "DOS box" in the sigrok-cli installation directory,
so that the firmware files and decoder files are found correctly.
We'll probably use another solution that sets %PATH% later on, though.

Thanks to Peter Newman for bringing up this issue.
---

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 402327c..cffe253 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -162,8 +162,8 @@ Section "@PACKAGE_NAME@ (required)" Section1
 
 	# Create a shortcut for sigrok-cli (this merely opens a "DOS box").
 	# Set the working directory (where the user will be placed into when
-	# the DOS box starts) to the user's Desktop directory.
-	SetOutPath "$DESKTOP"
+	# the DOS box starts) to the installation directory.
+	SetOutPath "$INSTDIR"
 	CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk" \
 		"$SYSDIR\cmd.exe" \
 		"/K echo For instructions run @PACKAGE_NAME@ --help." \