Bump version to 0.1.17.7

Merge branch 'issue-345'
Fix tests
2022-04-16 06:42:01 +02:00 · 2022-04-16 06:40:08 +02:00 · 2022-04-15 23:01:34 +02:00 · 2022-04-15 23:01:33 +02:00
4 changed files with 10 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ghcup

+## 0.1.17.7 -- ????-??-??
+
+* Fix `ghcup run` on windows wrt [#345](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/345)
+
 ## 0.1.17.6 -- 2022-03-18

 * Vastly improve shell completions wrt [#242](https://gitlab.haskell.org/haskell/ghcup-hs/-/merge_requests/242)
--- a/cabal.project
+++ b/cabal.project
@@ -15,7 +15,9 @@ source-repository-package

 constraints: http-io-streams -brotli,
             any.Cabal ==3.6.2.0,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             -- https://github.com/typeable/generic-arbitrary/issues/14
+             any.generic-arbitrary < 0.2.1

 package libarchive
  flags: -system-libarchive
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               ghcup
-version:            0.1.17.6
+version:            0.1.17.7
 license:            LGPL-3.0-only
 license-file:       LICENSE
 copyright:          Julian Ospald 2020
--- a/lib/GHCup/Utils/Prelude.hs
+++ b/lib/GHCup/Utils/Prelude.hs
@@ -473,7 +473,7 @@ recyclePathForcibly fp
      liftIO (moveFile fp dest)
          `catch`
          (\e -> if | isDoesNotExistError e -> pure ()
-                    | isPermissionError e {- EXDEV on windows -} -> recover (liftIO $ removePathForcibly fp)
+                    | isPermissionError e || ioeGetErrorType e == UnsupportedOperation {- EXDEV on windows -} -> recover (liftIO $ removePathForcibly fp)
                    | otherwise -> throwIO e)
          `finally`
            liftIO (handleIO (\_ -> pure ()) $ removePathForcibly tmp)
@@ -515,7 +515,7 @@ recycleFile fp
      let dest = tmp </> takeFileName fp
      liftIO (moveFile fp dest)
        `catch`
-          (\e -> if isPermissionError e {- EXDEV on windows -} then recover (liftIO $ removePathForcibly fp) else throwIO e)
+          (\e -> if isPermissionError e || ioeGetErrorType e == UnsupportedOperation {- EXDEV on windows -} then recover (liftIO $ removePathForcibly fp) else throwIO e)
        `finally`
          liftIO (handleIO (\_ -> pure ()) $ removePathForcibly tmp)
  | otherwise = liftIO $ removeFile fp
Author	SHA1	Message	Date
Julian Ospald	cfecc11b43	Bump version to 0.1.17.7	2022-04-16 06:42:01 +02:00
Julian Ospald	3d36348563	Merge branch 'issue-345'	2022-04-16 06:40:08 +02:00
Julian Ospald	dcbee9c7dc	Fix tests	2022-04-15 23:01:34 +02:00
Julian Ospald	2d88b1197e	Fix EXDEV handler on windows wrt #345	2022-04-15 23:01:33 +02:00