Make sure .bashrc is adjusted on windows during installation

Fixes #981
Merge branch 'issue-983'
2024-01-22 15:52:27 +08:00 · 2024-01-22 13:51:45 +08:00 · 2024-01-21 22:01:08 +08:00 · 2024-01-21 16:34:31 +08:00 · 2024-01-20 17:58:04 +08:00
11 changed files with 61 additions and 3 deletions
--- a/cabal.ghc8107.project
+++ b/cabal.ghc8107.project
@@ -12,6 +12,10 @@ else
 constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

+if os(mingw32)
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
@@ -22,6 +26,11 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

+source-repository-package
+  type: git
+  location: https://github.com/hasufell/versions.git
+  tag: 79e18fbc44fae3064d8957c550cc0229465db320
+
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc8107.project.freeze
+++ b/cabal.ghc8107.project.freeze
@@ -85,6 +85,7 @@ constraints: any.Cabal ==3.6.3.0,
             any.dlist ==1.0,
             dlist -werror,
             any.exceptions ==0.10.4,
+             any.file-uri ==0.1.0.0,
             any.filepath ==1.4.2.1,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
--- a/cabal.ghc902.project
+++ b/cabal.ghc902.project
@@ -12,6 +12,10 @@ else
 constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

+if os(mingw32)
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
@@ -22,6 +26,11 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

+source-repository-package
+  type: git
+  location: https://github.com/hasufell/versions.git
+  tag: 79e18fbc44fae3064d8957c550cc0229465db320
+
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc902.project.freeze
+++ b/cabal.ghc902.project.freeze
@@ -90,6 +90,7 @@ constraints: any.Cabal ==3.6.3.0,
             any.dlist ==1.0,
             dlist -werror,
             any.exceptions ==0.10.4,
+             any.file-uri ==0.1.0.0,
             any.filepath ==1.4.2.1,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
--- a/cabal.ghc928.project
+++ b/cabal.ghc928.project
@@ -12,6 +12,10 @@ else
 constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

+if os(mingw32)
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
@@ -22,6 +26,11 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

+source-repository-package
+  type: git
+  location: https://github.com/hasufell/versions.git
+  tag: 79e18fbc44fae3064d8957c550cc0229465db320
+
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc928.project.freeze
+++ b/cabal.ghc928.project.freeze
@@ -90,6 +90,7 @@ constraints: any.Cabal ==3.6.3.0,
             any.dlist ==1.0,
             dlist -werror,
             any.exceptions ==0.10.4,
+             any.file-uri ==0.1.0.0,
             any.filepath ==1.4.2.2,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
--- a/cabal.ghc948.project
+++ b/cabal.ghc948.project
@@ -12,6 +12,10 @@ else
 constraints: http-io-streams -brotli,
             any.aeson >= 2.0.1.0

+if os(mingw32)
+  if impl(ghc >= 9.4)
+    constraints: language-c >= 0.9.3
+
 source-repository-package
  type: git
  location: https://github.com/haskell/tar.git
@@ -22,6 +26,11 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

+source-repository-package
+  type: git
+  location: https://github.com/hasufell/versions.git
+  tag: 79e18fbc44fae3064d8957c550cc0229465db320
+
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc948.project.freeze
+++ b/cabal.ghc948.project.freeze
@@ -89,6 +89,7 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
             any.dlist ==1.0,
             dlist -werror,
             any.exceptions ==0.10.5,
+             any.file-uri ==0.1.0.0,
             any.filepath ==1.4.2.2,
             any.foldable1-classes-compat ==0.1,
             foldable1-classes-compat +tagged,
--- a/cabal.project
+++ b/cabal.project
@@ -26,6 +26,11 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

+source-repository-package
+  type: git
+  location: https://github.com/hasufell/versions.git
+  tag: 79e18fbc44fae3064d8957c550cc0229465db320
+
 package libarchive
  flags: -system-libarchive

--- a/cabal.project.release
+++ b/cabal.project.release
@@ -56,3 +56,10 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

+source-repository-package
+  type: git
+  location: https://github.com/hasufell/versions.git
+  tag: 79e18fbc44fae3064d8957c550cc0229465db320
+
+allow-newer: cabal-install-parsers:tar
+
--- a/scripts/bootstrap/bootstrap-haskell.ps1
+++ b/scripts/bootstrap/bootstrap-haskell.ps1
@@ -44,7 +44,9 @@ param (
    # The Msys2 sha256sum hash
    [string]$Msys2Hash,
    # Whether to disable creation of several desktop shortcuts
-    [switch]$DontWriteDesktopShortcuts
+    [switch]$DontWriteDesktopShortcuts,
+    # Whether to disable adjusting bashrc (in msys2 env) with PATH
+    [switch]$DontAdjustBashRc
 )

 $DefaultMsys2Version = "20221216"
@@ -647,10 +649,14 @@ if ($DisableCurl) {
  $DownloadScript = 'curl --proto ''=https'' --tlsv1.2 -sSf'
 }

+if (!($DontAdjustBashRc)) {
+  $AdjustBashRcExport = 'export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1 ;'
+}
+
 if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell") -Or $InBash) {
-  Exec "$Bash" '-lc' ('{4} {6} {7} {8} {9} {10} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript)
+  Exec "$Bash" '-lc' ('{4} {6} {7} {8} {9} {10} {12} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript, $AdjustBashRcExport)
 } else {
-  Exec "$Msys2Shell" '-mingw64' '-mintty'  '-shell' 'bash' '-c' ('{4} {6} {7} {8} {9} {10} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript)
+  Exec "$Msys2Shell" '-mingw64' '-mintty'  '-shell' 'bash' '-c' ('{4} {6} {7} {8} {9} {10} {12} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; [[ ''{0}'' = https* ]]  && {11} {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport, $MinimalExport, $BootstrapDownloader, $DownloadScript, $AdjustBashRcExport)
 }
Author	SHA1	Message	Date
Julian Ospald	59e6b65249	Make sure .bashrc is adjusted on windows during installation Fixes #981	2024-01-22 15:52:27 +08:00
Julian Ospald	91ef2c7666	Merge branch 'issue-983'	2024-01-22 13:51:45 +08:00
Julian Ospald	935cb5541b	Fix 'versions' version to resolver #983	2024-01-21 22:01:08 +08:00
Julian Ospald	9a7eb11c73	Merge branch 'issue-978'	2024-01-21 16:34:31 +08:00
Julian Ospald	3e9746cf0c	Fix cabal.project.release	2024-01-20 17:58:04 +08:00