Merge pull request #3141 from input-output-hk/fix/ddw-1226-windows-installer-lockfile

danielmain · web-flow · commit c0e369ec2d6e · 2024-04-04T15:58:43.000+02:00
[DDW-1226] Make Windows installer check if previous Daedalus is running
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Make Windows installer check if previous Daedalus is running ([PR 3141](https://github.com/input-output-hk/daedalus/pull/3141))
 - Fixed out-of-memory errors on https://ci.iog.io ([PR 3145](https://github.com/input-output-hk/daedalus/pull/3145))
 
 ## 5.3.0
diff --git a/installers/common/WindowsInstaller.hs b/installers/common/WindowsInstaller.hs
@@ -201,7 +201,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                         Development.NSIS.& ")..."
                         )
                     lockfileDeleted @= true
-                    onError (delete [] (str $ "$APPDATA\\$InstallDir\\" ++ T.unpack uglyName ++ "_lockfile")) $ do
+                    onError (delete [] (fromString $ "$APPDATA\\$InstallDir\\" ++ T.unpack uglyName ++ "_lockfile")) $ do
                         lockfileDeleted @= false
                     iff_ (not_ lockfileDeleted) $ do
                         sleep 1000 -- milliseconds

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto`
`201`	`201`	`Development.NSIS.& ")..."`
`202`	`202`	`)`
`203`	`203`	`lockfileDeleted @= true`
`204`		`- onError (delete [] (str $ "$APPDATA\\$InstallDir\\" ++ T.unpack uglyName ++ "_lockfile")) $ do`
	`204`	`+ onError (delete [] (fromString $ "$APPDATA\\$InstallDir\\" ++ T.unpack uglyName ++ "_lockfile")) $ do`
`205`	`205`	`lockfileDeleted @= false`
`206`	`206`	`iff_ (not_ lockfileDeleted) $ do`
`207`	`207`	`sleep 1000 -- milliseconds`