Fix ghcToolFiles for upcoming GHC build system changes

Also see: https://gitlab.haskell.org/ghc/ghc/-/issues/20074#note_363720

.gitlab-ci.yml

@@ -7,7 +7,7 @@ variables:
   GIT_SSL_NO_VERIFY: "1"
 
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 1ac7f435c9312f10422a82d304194778378e2a1a
+  DOCKER_REV: 8d0224e6b2a08157649651e69302380b2bd24e11
 
 ############################################################
 # CI Step
@@ -149,17 +149,19 @@ variables:
   script: |
     set -Eeuo pipefail
     function runInNixShell() {
-      time nix-shell .gitlab/shell.nix \
+      time nix-shell $CI_PROJECT_DIR/.gitlab/shell.nix \
         -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \
         --argstr system "aarch64-darwin" \
         --pure \
-        --keep GHC_VERSION --keep CABAL_INSTALL_VERSION --keep BUILD_FLAVOUR \
+        --keep CI_PROJECT_DIR \
-        --keep BIN_DIST_PREP_TAR_COMP --keep CPUS --keep PROJECT_DIR \
+        --keep MACOSX_DEPLOYMENT_TARGET \
-        --keep CI_PROJECT_DIR --keep MAKE_ARGS --keep HADRIAN_ARGS --keep CABAL_CACHE \
+        --keep JSON_VERSION \
-        --keep LANG --keep CONFIGURE_ARGS --keep TEST_ENV --keep BIN_DIST_NAME \
+        --keep ARTIFACT \
-        --keep MACOSX_DEPLOYMENT_TARGET --keep ac_cv_func_clock_gettime --keep HACKAGE_INDEX_STATE \
+        --keep OS \
-        --keep CABAL_DIR --keep ARCH --keep OS --keep CABAL_VERSION --keep GHC_VERSION \ 
+        --keep ARCH \
-        --keep JSON_VERSION --ARTIFACT \
+        --keep CABAL_DIR \
+        --keep GHC_VERSION \
+        --keep CABAL_VERSION \
         --run "$1" 2>&1
     }
     runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1
@@ -219,6 +221,23 @@ test:linux:bootstrap_script:
     CABAL_VERSION: "3.4.0.0"
   extends:
     - .debian
+    - .root_cleanup
+  needs: []
+
+test:windows:bootstrap_powershell_script:
+  stage: test
+  script:
+    - ./bootstrap-haskell.ps1 -InstallDir $CI_PROJECT_DIR -BootstrapUrl $CI_PROJECT_DIR/bootstrap-haskell -InBash
+  after_script:
+    - "[Environment]::SetEnvironmentVariable('GHCUP_INSTALL_BASE_PREFIX', $null, [System.EnvironmentVariableTarget]::User)"
+    - "[Environment]::SetEnvironmentVariable('GHCUP_MSYS2', $null, [System.EnvironmentVariableTarget]::User)"
+    - "[Environment]::SetEnvironmentVariable('CABAL_DIR', $null, [System.EnvironmentVariableTarget]::User)"
+    - bash ./.gitlab/after_script.sh
+  variables:
+    GHC_VERSION: "8.10.5"
+    CABAL_VERSION: "3.4.0.0"
+  extends:
+    - .windows
   needs: []
 
 ######## linux test ########
@@ -405,13 +424,9 @@ release:darwin:aarch64:
         -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \
         --argstr system "aarch64-darwin" \
         --pure \
-        --keep GHC_VERSION --keep CABAL_INSTALL_VERSION --keep BUILD_FLAVOUR \
-        --keep BIN_DIST_PREP_TAR_COMP --keep CPUS --keep PROJECT_DIR \
         --keep CI_PROJECT_DIR --keep MAKE_ARGS --keep HADRIAN_ARGS --keep CABAL_CACHE \
-        --keep LANG --keep CONFIGURE_ARGS --keep TEST_ENV --keep BIN_DIST_NAME \
+        --keep MACOSX_DEPLOYMENT_TARGET \
-        --keep MACOSX_DEPLOYMENT_TARGET --keep ac_cv_func_clock_gettime --keep HACKAGE_INDEX_STATE \
+        --keep JSON_VERSION --keep ARTIFACT \
-        --keep CABAL_DIR --keep ARCH --keep OS --keep CABAL_VERSION --keep GHC_VERSION \ 
-        --keep JSON_VERSION --ARTIFACT \
         --run "$1" 2>&1
     }
     runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1

.gitlab/before_script/darwin/install_deps.sh

@@ -19,4 +19,14 @@ fi
 ./ghcup-bin set ${GHC_VERSION}
 ./ghcup-bin install-cabal ${CABAL_VERSION}
 
+if [ $ARCH = 'ARM64' ] ; then
+	cabal update
+	mkdir vendored
+	cd vendored
+	cabal unpack network-3.1.2.1
+	cd network*
+	autoreconf -fi
+	cd ../..
+fi
+
 exit 0

.gitlab/script/ghcup_version.sh

@@ -104,35 +104,39 @@ if [ "${OS}" != "WINDOWS" ] ; then
 fi
 
 
-# test installing new ghc doesn't mess with currently set GHC
+if [ "${OS}" = "DARWIN" ] && [ "${ARCH}" = "ARM64" ] ; then
-# https://gitlab.haskell.org/haskell/ghcup-hs/issues/7
+	echo
-if [ "${OS}" = "LINUX" ] ; then
+else
-	eghcup --downloader=wget install 8.10.3
+	# test installing new ghc doesn't mess with currently set GHC
-else # test wget a bit
+	# https://gitlab.haskell.org/haskell/ghcup-hs/issues/7
-	eghcup install 8.10.3
+	if [ "${OS}" = "LINUX" ] ; then
-fi
+		eghcup --downloader=wget install 8.10.3
-[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
+	else # test wget a bit
-eghcup set 8.10.3
+		eghcup install 8.10.3
-eghcup set 8.10.3
+	fi
-[ "$(ghc --numeric-version)" = "8.10.3" ]
+	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
-eghcup set ${GHC_VERSION}
+	eghcup set 8.10.3
-[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
+	eghcup set 8.10.3
-eghcup rm 8.10.3
+	[ "$(ghc --numeric-version)" = "8.10.3" ]
-[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
+	eghcup set ${GHC_VERSION}
+	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
+	eghcup rm 8.10.3
+	[ "$(ghc --numeric-version)" = "${ghc_ver}" ]
 
-if [ "${OS}" = "DARWIN" ] ; then
+	if [ "${OS}" = "DARWIN" ] ; then
-	eghcup install hls
-	haskell-language-server-wrapper --version
-
-	eghcup install stack
-	stack --version
-elif [ "${OS}" = "LINUX" ] ; then
-	if [ "${ARCH}" = "64" ] ; then
 		eghcup install hls
 		haskell-language-server-wrapper --version
 
 		eghcup install stack
 		stack --version
+	elif [ "${OS}" = "LINUX" ] ; then
+		if [ "${ARCH}" = "64" ] ; then
+			eghcup install hls
+			haskell-language-server-wrapper --version
+
+			eghcup install stack
+			stack --version
+		fi
 	fi
 fi
 
@@ -150,3 +154,11 @@ fi
 eghcup upgrade
 eghcup upgrade -f
 
+
+# nuke
+eghcup nuke
+if [ "${OS}" = "WINDOWS" ] ; then
+	[ ! -e "${GHCUP_INSTALL_BASE_PREFIX}/ghcup" ]
+else
+	[ ! -e "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup" ]
+fi

.gitlab/shell.nix

@@ -44,9 +44,6 @@
   # unconditionally add the MacOSX.sdk and TargetConditional.h
   export NIX_CFLAGS_COMPILE+=" -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
 
-  # Use an architecture specific home, so cabal for different architectures don't confuse each other.
-  export HOME="$HOME/$(uname -m)-home"
-  mkdir -p $HOME
   '';
 
   nativeBuildInputs = (with pkgs; [
@@ -81,6 +78,7 @@
 
     which
     wget
+	curl
     file
 
     xz

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for ghcup
 
+## 0.1.16 -- ????-??-??
+
+* Add 'nuke' subcommand wrt [#135](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/135), implemented by Arjun Kathuria
+
 ## 0.1.15.2 -- 2021-06-13
 
 * Remove legacy handling of cabal binary and be more graceful about binaries not installed by ghcup (e.g. stack)

README.md

@@ -1,5 +1,5 @@
 `ghcup` makes it easy to install specific versions of `ghc` on GNU/Linux,
-macOS (aka Darwin) and FreeBSD and can also bootstrap a fresh Haskell developer environment from scratch.
+macOS (aka Darwin), FreeBSD and Windows and can also bootstrap a fresh Haskell developer environment from scratch.
 It follows the unix UNIX philosophy of [do one thing and do it well](https://en.wikipedia.org/wiki/Unix_philosophy#Do_One_Thing_and_Do_It_Well).
 
 Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [pyenv](https://github.com/pyenv/pyenv) and [jenv](http://www.jenv.be).
@@ -85,7 +85,7 @@ handles your haskell packages and can demand that [a specific version](https://c
 A configuration file can be put in `~/.ghcup/config.yaml`. The default config file
 explaining all possible configurations can be found in this repo: [config.yaml](./config.yaml).
 
-Partial configuration is fine. Command line options always overwrite the config file settings.
+Partial configuration is fine. Command line options always override the config file settings.
 
 ### Manpages
 

app/ghcup/Main.hs

@@ -1113,7 +1113,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
           let loggerConfig = LoggerConfig
                 { lcPrintDebug = verbose settings
                 , colorOutter  = B.hPut stderr
-                , rawOutter    = B.appendFile logfile
+                , rawOutter    =
+                    case optCommand of
+                      Nuke -> \_ -> pure ()
+                      _ -> B.appendFile logfile
                 }
           let runLogger = myLoggerT loggerConfig
           let siletRunLogger = myLoggerT loggerConfig { colorOutter = \_ -> pure () }
@@ -1703,31 +1706,27 @@ Make sure to clean up #{tmpdir} afterwards.|])
 
             Nuke ->
               runRm (do
-                   lift $ runLogger $ $logWarn "WARNING: This will remove GHCup and all installed components from your system."
+                   lift $ $logWarn "WARNING: This will remove GHCup and all installed components from your system."
-                   lift $ runLogger $ $logWarn "Waiting 10 seconds before commencing, if you want to cancel it, now would be the time."
+                   lift $ $logWarn "Waiting 10 seconds before commencing, if you want to cancel it, now would be the time."
                    liftIO $ threadDelay 10000000  -- wait 10s
 
-                   lift $ runLogger $ $logInfo "Initiating Nuclear Sequence 🚀🚀🚀"
+                   lift $ $logInfo "Initiating Nuclear Sequence 🚀🚀🚀"
-                   lift $ runLogger $ $logInfo "Nuking in 3...2...1"
+                   lift $ $logInfo "Nuking in 3...2...1"
               
-
+                   lInstalled <- lift $ listVersions Nothing (Just ListInstalled)
-                   lInstalled <- lift $ runLogger . flip runReaderT appstate $ listVersions Nothing (Just ListInstalled)
 
                    forM_ lInstalled (liftE . rmTool)
 
-                   leftOverFiles <- lift $ runLogger $ runReaderT rmGhcupDirs appstate
+                   lift rmGhcupDirs
-                   pure leftOverFiles
 
                    ) >>= \case
-                            VRight leftOverFiles -> do
+                            VRight leftOverFiles
-
+                              | null leftOverFiles -> do
-                              case length leftOverFiles of
-                                0 -> do
                                   runLogger $ $logInfo "Nuclear Annihilation complete!"
                                   pure ExitSuccess
-                                _ -> do
+                              | otherwise -> do
-                                  runLogger $ $logWarn "These Directories/Files have survived Nuclear Annihilation, you may remove them manually."
+                                  runLogger $ $logWarn "These Files have survived Nuclear Annihilation, you may remove them manually."
-                                  forM_ leftOverFiles (runLogger . $logDebug . T.pack)
+                                  forM_ leftOverFiles putStrLn
                                   pure ExitSuccess
 
                             VLeft e -> do

bootstrap-haskell

@@ -210,6 +210,90 @@ download_ghcup() {
     eghcup upgrade
 }
 
+adjust_bashrc() {
+	case $SHELL in
+		*/zsh) # login shell is zsh
+			GHCUP_PROFILE_FILE="$HOME/.zshrc"
+			MY_SHELL="zsh" ;;
+		*/bash) # login shell is bash
+			GHCUP_PROFILE_FILE="$HOME/.bashrc"
+			MY_SHELL="bash" ;;
+		*/sh) # login shell is sh, but might be a symlink to bash or zsh
+			if [ -n "${BASH}" ] ; then
+				GHCUP_PROFILE_FILE="$HOME/.bashrc"
+				MY_SHELL="bash"
+			elif [ -n "${ZSH_VERSION}" ] ; then
+				GHCUP_PROFILE_FILE="$HOME/.zshrc"
+				MY_SHELL="zsh"
+			else
+				return
+			fi
+			;;
+		*/fish) # login shell is fish
+			GHCUP_PROFILE_FILE="$HOME/.config/fish/config.fish"
+			MY_SHELL="fish" ;;
+		*) return ;;
+	esac
+
+
+	warn ""
+	warn "Detected ${MY_SHELL} shell on your system..."
+	warn "If you want ghcup to automatically add the required PATH variable to \"${GHCUP_PROFILE_FILE}\""
+	warn ""
+	warn "[Y] Yes  [N] No  [?] Help (default is \"Y\")."
+	warn ""
+
+	while true; do
+		if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
+			read -r next_answer </dev/tty
+		else
+			next_answer="yes"
+		fi
+
+		case $next_answer in
+			[Nn]*)
+				return ;;
+			[Yy]* | "")
+				case $MY_SHELL in
+					"") break ;;
+					fish)
+							mkdir -p "${GHCUP_PROFILE_FILE%/*}"
+							sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
+							echo "set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX \$HOME ; test -f $GHCUP_DIR/env ; and set -gx PATH \$HOME/.cabal/bin $GHCUP_BIN \$PATH # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+						break ;;
+					bash)
+						sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
+						echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+						case "${plat}" in
+							"Darwin"|"darwin")
+								if ! grep -q "ghcup-env" "${HOME}/.bash_profile" ; then
+									echo "[[ -f ~/.bashrc ]] && source ~/.bashrc # ghcup-env" >> "${HOME}/.bash_profile"
+								fi
+								;;
+						esac
+						break ;;
+
+					zsh)
+						sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
+						echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+						break ;;
+				esac
+				warn "OK! ${GHCUP_PROFILE_FILE} has been modified. Restart your terminal for the changes to take effect,"
+				warn "or type \"source ${GHCUP_DIR}/env\" to apply them in your current terminal session."
+				return
+				;;
+			*)
+				echo "Possible choices are:"
+				echo
+				echo "Y - Yes, update my \"${GHCUP_PROFILE_FILE}\" (default)"
+				echo "N - No, don't mess with my configuration"
+				echo
+				echo "Please make your choice and press ENTER."
+				;;
+		esac
+	done
+}
+
 
 echo
 echo "Welcome to Haskell!"
@@ -317,6 +401,7 @@ esac
 
 edo cabal new-update
 
+
 if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 	warn "Do you want to install haskell-language-server (HLS) now?"
 	warn "HLS is a language-server that provides IDE-like functionality"
@@ -372,89 +457,24 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 				;;
 		esac
 	done
+fi
 
-    echo "In order to run ghc and cabal, you need to adjust your PATH variable."
+# short-circuit script based on platform
-    echo "You may want to source '$GHCUP_DIR/env' in your shell"
+case "${plat}" in
-    echo "configuration to do so (e.g. ~/.bashrc)."
+        MSYS*|MINGW*)
+			# For windows we always adjust bashrc, since it's inside msys2
+			adjust_bashrc
+			;;
+		*)
+        	if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
+				echo "In order to run ghc and cabal, you need to adjust your PATH variable."
+				echo "You may want to source '$GHCUP_DIR/env' in your shell"
+				echo "configuration to do so (e.g. ~/.bashrc)."
 
-	case $SHELL in
+				adjust_bashrc
-		*/zsh) # login shell is zsh
-			GHCUP_PROFILE_FILE="$HOME/.zshrc"
-			MY_SHELL="zsh" ;;
-		*/bash) # login shell is bash
-			GHCUP_PROFILE_FILE="$HOME/.bashrc"
-			MY_SHELL="bash" ;;
-		*/sh) # login shell is sh, but might be a symlink to bash or zsh
-			if [ -n "${BASH}" ] ; then
-				GHCUP_PROFILE_FILE="$HOME/.bashrc"
-				MY_SHELL="bash"
-			elif [ -n "${ZSH_VERSION}" ] ; then
-				GHCUP_PROFILE_FILE="$HOME/.zshrc"
-				MY_SHELL="zsh"
-			else
-			    _done
 			fi
 			;;
-		*/fish) # login shell is fish
+esac
-			GHCUP_PROFILE_FILE="$HOME/.config/fish/config.fish"
-			MY_SHELL="fish" ;;
-		*) _done ;;
-	esac
-
-
-	warn ""
-	warn "Detected ${MY_SHELL} shell on your system..."
-	warn "If you want ghcup to automatically add the required PATH variable to \"${GHCUP_PROFILE_FILE}\""
-	warn ""
-	warn "[Y] Yes  [N] No  [?] Help (default is \"Y\")."
-	warn ""
-
-    while true; do
-        read -r next_answer </dev/tty
-
-        case $next_answer in
-            [Nn]*)
-                _done ;;
-            [Yy]* | "")
-				case $MY_SHELL in
-					"") break ;;
-					fish)
-							mkdir -p "${GHCUP_PROFILE_FILE%/*}"
-							sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
-							echo "set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX \$HOME ; test -f $GHCUP_DIR/env ; and set -gx PATH \$HOME/.cabal/bin $GHCUP_BIN \$PATH # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
-						break ;;
-					bash)
-						sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
-						echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
-						case "${plat}" in
-							"Darwin"|"darwin")
-								if ! grep -q "ghcup-env" "${HOME}/.bash_profile" ; then
-									echo "[[ -f ~/.bashrc ]] && source ~/.bashrc # ghcup-env" >> "${HOME}/.bash_profile"
-								fi
-								;;
-						esac
-						break ;;
-
-					zsh)
-						sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
-						echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
-						break ;;
-				esac
-                warn "OK! ${GHCUP_PROFILE_FILE} has been modified. Restart your terminal for the changes to take effect,"
-                warn "or type \"source ${GHCUP_DIR}/env\" to apply them in your current terminal session."
-				_done
-                ;;
-			*)
-				echo "Possible choices are:"
-				echo
-				echo "Y - Yes, update my \"${GHCUP_PROFILE_FILE}\" (default)"
-				echo "N - No, don't mess with my configuration"
-				echo
-				echo "Please make your choice and press ENTER."
-				;;
-        esac
-    done
-fi
 
 _done
 

bootstrap-haskell.ps1

@@ -13,20 +13,24 @@
     * hls   - (optional) A language server for developers to integrate with their editor/IDE"
 #>
 param (
-    # Run a non-interactive installation
+    # Run an interactive installation
-    [switch]$Silent,
+    [switch]$Interactive,
     # Specify the install root (default: 'C:\')
     [string]$InstallDir,
     # Instead of installing a new MSys2, use an existing installation
     [string]$ExistingMsys2Dir,
     # Specify the cabal root directory (default: '$InstallDir\cabal')
     [string]$CabalDir,
-    # Perform a quick installation, omitting some expensive operations (you may have to install dependencies yourself later)
-    [bool]$Quick,
     # Overwrite (or rather backup) a previous install
-    [bool]$Overwrite
+    [switch]$Overwrite,
+    # Specify the bootstrap url (default: 'https://www.haskell.org/ghcup/sh/bootstrap-haskell')
+    [string]$BootstrapUrl,
+    # Run the final bootstrap script via 'bash' instead of a full newly spawned msys2 shell
+    [switch]$InBash
 )
 
+$Silent = !$Interactive
+
 function Print-Msg {
   param ( [Parameter(Mandatory=$true, HelpMessage='String to output')][string]$msg, [string]$color = "Green" )
   Write-Host ('{0}' -f $msg) -ForegroundColor $color
@@ -151,7 +155,27 @@ $GhcupBasePrefixEnv = [System.Environment]::GetEnvironmentVariable('GHCUP_INSTAL
 if ($GhcupBasePrefixEnv) {
   $defaultGhcupBasePrefix = $GhcupBasePrefixEnv
 } else {
-  $defaultGhcupBasePrefix = 'C:\'
+  $partitions = Get-CimInstance win32_logicaldisk
+  $defaultGhcupBasePrefix = $null
+  foreach ($p in $partitions){
+    try {
+      if ($p."FreeSpace" -lt 5368709120) { # at least 5 GB are needed
+        throw ("Not enough free space on {0}" -f $p."DeviceId")
+      }
+      $null = New-Item -Path ('{0}\' -f $p."DeviceId") -Name "ghcup.test" -ItemType "directory" -Force
+      $defaultGhcupBasePrefix = ('{0}\' -f $p."DeviceId")
+      Remove-Item -LiteralPath ('{0}\ghcup.test' -f $p."DeviceId")
+      break
+    } catch {
+      Print-Msg -color Yellow -msg ("{0} not writable or not enough disk space, trying next device" -f $p."DeviceId")
+    }
+  }
+  if ($defaultGhcupBasePrefix) {
+    Print-Msg -color Green -msg ("Picked {0} as default Install prefix!" -f $defaultGhcupBasePrefix)
+  } else {
+    Print-Msg -color Red -msg "Couldn't find a writable partition with at least 5GB free disk space!"
+    Exit 1    
+  }
 }
 
 if ($Silent -and !($InstallDir)) {
@@ -194,7 +218,9 @@ $null = [Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $Ghcu
 $GhcupDir = ('{0}\ghcup' -f $GhcupBasePrefix)
 $MsysDir = ('{0}\msys64' -f $GhcupDir)
 $Bash = ('{0}\usr\bin\bash' -f $MsysDir)
-$BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell'
+if (!($BootstrapUrl)) {
+  $BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell'
+}
 $GhcupMsys2 = [System.Environment]::GetEnvironmentVariable('GHCUP_MSYS2', 'user')
 
 Print-Msg -msg 'Preparing for GHCup installation...'
@@ -268,20 +294,8 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
     Print-Msg -msg 'Upgrading full system twice...'
     Exec "$Bash" '-lc' 'pacman --noconfirm -Syuu'
 
-    if ($Quick) {
+    Print-Msg -msg 'Installing Dependencies...'
-      $ghcBuildDeps = $Quick
+    Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed curl mingw-w64-x86_64-pkgconf'
-    } elseif (!($Silent)) {
-      $ghcBuildDeps = $Host.UI.PromptForChoice('Install Dependencies'
-        , 'Install a standard set of mingw64 packages to be able to build various haskell packages requiring unix libraries? (recommended, however this might take a while... if you skip this, you might have to do it manually later)'
-        , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
-            '&No'), 0)
-    } else {
-      $ghcBuildDeps = 0
-    }
-    if ($ghcBuildDeps -eq 0) {
-      Print-Msg -msg 'Installing Dependencies...'
-      Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake pkgconf python p7zip patch unzip'
-    }
 
     Print-Msg -msg 'Updating SSL root certificate authorities...'
     Exec "$Bash" '-lc' 'pacman --noconfirm -S ca-certificates'
@@ -319,8 +333,11 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
 }
 
 Print-Msg -msg 'Creating shortcuts...'
-Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe '-mingw64' -DestinationPath ('{0}\Desktop\Mingw haskell shell.lnk' -f $HOME)
+$DesktopDir = [Environment]::GetFolderPath("Desktop")
-Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -ArgumentsToSourceExe '' -DestinationPath ('{0}\Desktop\Mingw package management docs.url' -f $HOME)
+$GhcInstArgs = '-mingw64 -mintty -c "pacman --noconfirm -S --needed base-devel gettext autoconf make libtool automake python p7zip patch unzip"'
+Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe $GhcInstArgs -DestinationPath ('{0}\Install GHC dev dependencies.lnk' -f $DesktopDir)
+Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourceExe '-mingw64' -DestinationPath ('{0}\Mingw haskell shell.lnk' -f $DesktopDir)
+Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -ArgumentsToSourceExe '' -DestinationPath ('{0}\Mingw package management docs.url' -f $DesktopDir)
 
 Print-Msg -msg ('Adding {0}\bin to Users Path...' -f $GhcupDir)
 Add-EnvPath -Path ('{0}\bin' -f ([System.IO.Path]::GetFullPath("$GhcupDir"))) -Container 'User'
@@ -368,10 +385,10 @@ if ($Silent) {
   $SilentExport = ''
 }
 
-if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) {
+if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell") -Or $InBash) {
-  Exec "$Bash" '-lc' ('{4} [ -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}'' ; curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
+  Exec "$Bash" '-lc' ('{4} [ -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* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
 } else {
-  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} [ -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 ; curl --proto =https --tlsv1.2 -sSf -k {0} | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
+  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} [ -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* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
 }
 
 
@@ -399,3 +416,7 @@ if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) {
   # E5VhEwLBnwzWrvLKtdEclhgUCo5Tq87QMXVdgX4aRmunl4ZE+Q==
 # SIG # End signature block
 
+
+
+
+

cabal.project

@@ -1,5 +1,7 @@
 packages: ./ghcup.cabal
 
+optional-packages: ./vendored/*/*.cabal
+
 optimization: 2
 
 package ghcup

ghcup-0.0.5.yaml

@@ -1,8 +1,8 @@
 ---
 globalTools:
   ShimGen:
-    dlUri: https://downloads.haskell.org/~ghcup/shimgen/gs.exe
+    dlUri: https://downloads.haskell.org/~ghcup/shimgen/shim-2.exe
-    dlHash: 9ce8b7dad7ff4e5017dbd63d6f6f3d16412b889560cb6ccd3903dbcab0bf4f0d
+    dlHash: 7c55e201f71860c5babea886007c8fa44b861abf50d1c07e5677eb0bda387a70
 toolRequirements:
   GHC:
     unknown_version:
@@ -2107,7 +2107,7 @@ ghcupDownloads:
           Darwin:
             unknown_versioning:
               dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.2.0/haskell-language-server-macOS-1.2.0.tar.gz
-              dlHash: 43d2ef356fb8cbd8e27acf70f94c079157258916bb1220751547584513584aaa
+              dlHash: a310d8a3e9c5c4218210f750682c74a0f82ad0f59995adde0dbe775115b1e357
           Windows:
             unknown_versioning:
               dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.2.0/haskell-language-server-Windows-1.2.0.tar.gz

ghcup.cabal

@@ -43,9 +43,7 @@ flag internal-downloader
   manual:      True
 
 flag tar
-  description:
+  description: Use tar-bytestring instead of libarchive.
-    Use tar-bytestring instead of libarchive.
-
   default:     False
   manual:      True
 
@@ -142,7 +140,7 @@ library
     , uri-bytestring        ^>=0.3.2.2
     , utf8-string           ^>=1.0
     , vector                ^>=0.12
-    , versions              ^>=4.0.1
+    , versions              >=4.0.1      && <5.1
     , word8                 ^>=0.1.3
     , yaml                  ^>=0.11.4.0
     , zip                   ^>=1.7.1
@@ -226,7 +224,7 @@ executable ghcup
     , text                  ^>=1.2.4.0
     , uri-bytestring        ^>=0.3.2.2
     , utf8-string           ^>=1.0
-    , versions              ^>=4.0.1
+    , versions              >=4.0.1    && <5.1
 
   if flag(internal-downloader)
     cpp-options: -DINTERNAL_DOWNLOADER
@@ -294,7 +292,7 @@ executable ghcup-gen
     , text                  ^>=1.2.4.0
     , transformers          ^>=0.5
     , uri-bytestring        ^>=0.3.2.2
-    , versions              ^>=4.0.1
+    , versions              >=4.0.1    && <5.1
     , yaml                  ^>=0.11.4.0
 
   if flag(tar)
@@ -338,4 +336,4 @@ test-suite ghcup-test
     , quickcheck-arbitrary-adt  ^>=0.3.1.0
     , text                      ^>=1.2.4.0
     , uri-bytestring            ^>=0.3.2.2
-    , versions                  ^>=4.0.1
+    , versions                  >=4.0.1   && <5.1

lib/GHCup.hs

@@ -42,6 +42,7 @@ import           GHCup.Version
 import           Codec.Archive                  ( ArchiveResult )
 #endif
 import           Control.Applicative
+import           Control.Exception              ( evaluate )
 import           Control.Exception.Safe
 import           Control.Monad
 #if !MIN_VERSION_base(4,13,0)
@@ -1295,7 +1296,7 @@ rmGhcup = do
   let ghcupFilename = "ghcup" <> exeExt
   let ghcupFilepath = binDir </> ghcupFilename
 
-  currentRunningExecPath <- liftIO $ getExecutablePath
+  currentRunningExecPath <- liftIO getExecutablePath
 
   -- if paths do no exist, warn user, and continue to compare them, as is,
   -- which should eventually fail and result in a non-standard install warning
@@ -1305,29 +1306,25 @@ rmGhcup = do
                   (liftIO $ canonicalizePath currentRunningExecPath)
 
   p2 <- handleIO' doesNotExistErrorType
-                  (handlePathNotPresent ghcupFilename)
+                  (handlePathNotPresent ghcupFilepath)
-                  (liftIO $ canonicalizePath ghcupFilename)
+                  (liftIO $ canonicalizePath ghcupFilepath)
 
   let areEqualPaths = equalFilePath p1 p2
 
-  if areEqualPaths
+  unless areEqualPaths $ $logWarn $ nonStandardInstallLocationMsg currentRunningExecPath
-    then
+
-      do
 #if defined(IS_WINDOWS)
-    -- since it doesn't seem possible to delete a running exec in windows
+  -- since it doesn't seem possible to delete a running exec in windows
-    -- we move it to temp dir, to be deleted at next reboot
+  -- we move it to temp dir, to be deleted at next reboot
-        tempDir <- liftIO $ getTemporaryDirectory
+  tempDir <- liftIO $ getTemporaryDirectory
-        let tempFilepath = tempDir </> ghcupFilename
+  let tempFilepath = tempDir </> ghcupFilename
-        hideError UnsupportedOperation $
+  hideError UnsupportedOperation $
-                  liftIO $ hideError NoSuchThing $
+            liftIO $ hideError NoSuchThing $
-                  Win32.moveFileEx ghcupFilepath (Just tempFilepath) 1
+            Win32.moveFileEx ghcupFilepath (Just tempFilepath) Win32.mOVEFILE_REPLACE_EXISTING
 #else
-    -- delete it.
+  -- delete it.
-        hideError doesNotExistErrorType $ liftIO $ rmFile ghcupFilepath
+  hideError doesNotExistErrorType $ liftIO $ rmFile ghcupFilepath
 #endif
-    else
-      $logWarn $
-      nonStandardInstallLocationMsg currentRunningExecPath
 
   where
     handlePathNotPresent fp _err = do
@@ -1348,86 +1345,73 @@ rmTool :: ( MonadReader AppState m
            -> Excepts '[NotInstalled ] m ()
 
 rmTool ListResult {lVer, lTool, lCross} = do
-  -- appstate <- ask
-
   case lTool of
-    GHC -> do
+    GHC ->
       let ghcTargetVersion = GHCTargetVersion lCross lVer
-      rmGHCVer ghcTargetVersion
+      in rmGHCVer ghcTargetVersion
+    HLS -> rmHLSVer lVer
+    Cabal -> rmCabalVer lVer
+    Stack -> rmStackVer lVer
+    GHCup -> lift rmGhcup
 
-    HLS -> do
-      rmHLSVer lVer
-
-    Cabal -> do
-      rmCabalVer lVer
-
-    Stack -> do
-      rmStackVer lVer
-
-    GHCup -> do
-      lift rmGhcup
 
 rmGhcupDirs :: ( MonadReader AppState m
                , MonadIO m
                , MonadLogger m
                , MonadCatch m
                , MonadMask m )
-                => m [FilePath]
+            => m [FilePath]
 rmGhcupDirs = do
-  dirs@Dirs
+  Dirs
     { baseDir
     , binDir
     , logsDir
     , cacheDir
-    , confDir } <- asks dirs
+    } <- asks dirs
 
   let envFilePath = baseDir </> "env"
 
   confFilePath <- getConfigFilePath
 
-  -- remove env File
+  rmEnvFile  envFilePath
-  rmEnvFile envFilePath
-
--- remove the configFile file
   rmConfFile confFilePath
+  rmDir cacheDir
+  rmDir logsDir
+  rmBinDir   binDir
+#if defined(IS_WINDOWS)
+  rmDir (baseDir </> "msys64")
+#endif
 
-  -- remove entire cache Dir
+  liftIO $ removeEmptyDirsRecursive baseDir
-  rmCacheDir cacheDir
 
-  -- remove entire logs Dir
+  -- report files in baseDir that are left-over after
-  rmLogsDir logsDir
+  -- the standard location deletions above
-
+  hideErrorDef [doesNotExistErrorType] [] $ reportRemainingFiles baseDir
-  -- remove bin directory conditionally
-  rmBinDir binDir
-
-  -- report files in baseDir that are left-over after the standard location deletions above
-  reportRemainingFiles baseDir
 
   where
 
+    rmEnvFile :: (MonadCatch m, MonadLogger m, MonadIO m) => FilePath -> m ()
     rmEnvFile enFilePath = do
       $logInfo "Removing Ghcup Environment File"
       hideError doesNotExistErrorType $ liftIO $ deleteFile enFilePath
 
+    rmConfFile :: (MonadCatch m, MonadLogger m, MonadIO m) => FilePath -> m ()
     rmConfFile confFilePath = do
       $logInfo "removing Ghcup Config File"
       hideError doesNotExistErrorType $ liftIO $ deleteFile confFilePath
 
-    rmCacheDir cacheDir = do
+    rmDir :: (MonadLogger m, MonadIO m, MonadCatch m) => FilePath -> m ()
-      $logInfo "removing ghcup cache Dir"
+    rmDir dir = do
-      contents <- liftIO $ listDirectory cacheDir
+      $logInfo [i|removing #{dir}|]
-      forM_ contents deleteFile
+      contents <- hideErrorDef [doesNotExistErrorType] []
-      removeDirIfEmptyOrIsSymlink cacheDir
+        $ liftIO
-
+        (getDirectoryContentsRecursive dir >>= evaluate)
-    rmLogsDir logsDir = do
+      forM_ contents (liftIO . deleteFile . (dir </>))
-      $logInfo "removing ghcup logs Dir"
-      contents <- liftIO $ listDirectory logsDir
-      forM_ contents deleteFile
-      removeDirIfEmptyOrIsSymlink logsDir
 
+    rmBinDir :: (MonadCatch m, MonadIO m) => FilePath -> m ()
     rmBinDir binDir = do
 #if !defined(IS_WINDOWS)
-      isXDGStyle <- liftIO $ useXDG
+      isXDGStyle <- liftIO useXDG
       if not isXDGStyle
         then removeDirIfEmptyOrIsSymlink binDir
         else pure ()
@@ -1435,11 +1419,12 @@ rmGhcupDirs = do
       removeDirIfEmptyOrIsSymlink binDir
 #endif
 
-    reportRemainingFiles ghcupDir = do
+    reportRemainingFiles :: MonadIO m => FilePath -> m [FilePath]
-      remainingFiles <- liftIO $ getDirectoryContentsRecursive ghcupDir
+    reportRemainingFiles dir = do
+      remainingFiles <- liftIO $ getDirectoryContentsRecursive dir
       let normalizedFilePaths = fmap normalise remainingFiles
-      let sortedByDepthRemainingFiles = reverse $ sortBy compareFn normalizedFilePaths
+      let sortedByDepthRemainingFiles = sortBy (flip compareFn) normalizedFilePaths
-      remainingFilesAbsolute <- makePathsAbsolute sortedByDepthRemainingFiles
+      let remainingFilesAbsolute = fmap (dir </>) sortedByDepthRemainingFiles
 
       pure remainingFilesAbsolute
 
@@ -1450,17 +1435,22 @@ rmGhcupDirs = do
         compareFn :: FilePath -> FilePath -> Ordering
         compareFn fp1 fp2 = compare (calcDepth fp1) (calcDepth fp2)
 
-    makePathsAbsolute :: (MonadIO m) => [FilePath] -> m [FilePath]
+    removeEmptyDirsRecursive :: FilePath -> IO ()
-    makePathsAbsolute paths = liftIO $
+    removeEmptyDirsRecursive fp = do
-                              traverse (makeAbsolute . normalise) paths
+      cs <- listDirectory fp >>= filterM doesDirectoryExist . fmap (fp </>)
+      forM_ cs removeEmptyDirsRecursive
+      hideError InappropriateType $ removeDirIfEmptyOrIsSymlink fp
+        
 
     -- we expect only files inside cache/log dir
     -- we report remaining files/dirs later,
     -- hence the force/quiet mode in these delete functions below.
 
+    deleteFile :: FilePath -> IO ()
     deleteFile filepath = do
       hideError InappropriateType $ rmFile filepath
 
+    removeDirIfEmptyOrIsSymlink :: (MonadCatch m, MonadIO m) => FilePath -> m ()
     removeDirIfEmptyOrIsSymlink filepath =
       hideError UnsatisfiedConstraints $
       handleIO' InappropriateType
@@ -1473,6 +1463,8 @@ rmGhcupDirs = do
           then liftIO $ deleteFile fp
           else liftIO $ ioError e
 
+
+
     ------------------
     --[ Debug info ]--
     ------------------
@@ -1813,14 +1805,14 @@ upgradeGHCup :: ( MonadMask m
                    ]
                   m
                   Version
-upgradeGHCup mtarget force = do
+upgradeGHCup mtarget force' = do
   AppState { dirs = Dirs {..}
            , pfreq
            , ghcupInfo = GHCupInfo { _ghcupDownloads = dls }
            , settings } <- lift ask
   lift $ $(logInfo) [i|Upgrading GHCup...|]
   let latestVer = fromJust $ fst <$> getLatest dls GHCup
-  when (not force && (latestVer <= pvpToVersion ghcUpVer)) $ throwE NoUpdate
+  when (not force' && (latestVer <= pvpToVersion ghcUpVer)) $ throwE NoUpdate
   dli   <- lE $ getDownloadInfo GHCup latestVer pfreq dls
   tmp   <- lift withGHCupTmpDir
   let fn = "ghcup" <> exeExt

lib/GHCup/Utils.hs

@@ -765,49 +765,22 @@ ghcToolFiles ver = do
   whenM (fmap not $ liftIO $ doesDirectoryExist ghcdir)
         (throwE (NotInstalled GHC ver))
 
-  files    <- liftIO $ listDirectory bindir
+  files <- liftIO (listDirectory bindir >>= filterM (doesFileExist . (bindir </>)))
-  -- figure out the <ver> suffix, because this might not be `Version` for
+  pure (getUniqueTools . groupToolFiles . fmap (dropSuffix exeExt) $ files)
-  -- alpha/rc releases, but x.y.a.somedate.
 
-  ghcIsHadrian    <- liftIO $ isHadrian bindir
-  onlyUnversioned <- case ghcIsHadrian of
-    Right () -> pure id
-    Left (fmap (dropSuffix exeExt) -> [ghc, ghc_ver])
-      | (Just symver) <- stripPrefix (ghc <> "-") ghc_ver
-      , not (null symver) -> pure $ filter (\x -> not $ symver `isInfixOf` x)
-    _ -> fail "Fatal: Could not find internal GHC version"
-
-  pure $ onlyUnversioned $ fmap (dropSuffix exeExt) files
  where
-  isNotAnyInfix xs t = foldr (\a b -> not (a `isInfixOf` t) && b) True xs
-    -- GHC is moving some builds to Hadrian for bindists,
-    -- which doesn't create versioned binaries.
-    -- https://gitlab.haskell.org/haskell/ghcup-hs/issues/31
-  isHadrian :: FilePath -- ^ ghcbin path
-            -> IO (Either [String] ()) -- ^ Right for Hadrian
-  isHadrian dir = do
-    -- Non-hadrian has e.g. ["ghc", "ghc-8.10.4"]
-    -- which also requires us to discover the internal version
-    -- to filter the correct tool files.
-    -- We can't use the symlink on windows, so we fall back to some
-    -- more complicated logic.
-    fs <- fmap
-         -- regex over-matches
-         (filter (isNotAnyInfix ["haddock", "ghc-pkg", "ghci"]))
-       $ liftIO $ findFiles
-      dir
-      (makeRegexOpts compExtended
-                     execBlank
-                     -- for cross, this won't be "ghc", but e.g.
-                     -- "armv7-unknown-linux-gnueabihf-ghc"
-                     ([s|^([a-zA-Z0-9_-]*[a-zA-Z0-9_]-)?ghc.*$|] :: ByteString)
-      )
-    if | length fs == 1 -> pure $ Right ()        -- hadrian
-       | length fs == 2 -> pure $ Left
-                              (sortOn length fs)  -- legacy make, result should
-                                                  -- be ["ghc", "ghc-8.10.4"]
-       | otherwise      -> fail "isHadrian failed!"
 
+  groupToolFiles :: [FilePath] -> [[(FilePath, String)]]
+  groupToolFiles = groupBy (\(a, _) (b, _) -> a == b) . fmap (splitOnPVP "-")
+
+  getUniqueTools :: [[(FilePath, String)]] -> [String]
+  getUniqueTools = filter (isNotAnyInfix blackListedTools) . nub . fmap fst . filter ((== "") . snd) . concat
+
+  blackListedTools :: [String]
+  blackListedTools = ["haddock-ghc"]
+
+  isNotAnyInfix :: [String] -> String -> Bool
+  isNotAnyInfix xs t = foldr (\a b -> not (a `isInfixOf` t) && b) True xs
 
 
 -- | This file, when residing in @~\/.ghcup\/ghc\/\<ver\>\/@ signals that

lib/GHCup/Utils/Prelude.hs

@@ -26,7 +26,7 @@ import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Class      ( lift )
 import           Data.Bifunctor
 import           Data.ByteString                ( ByteString )
-import           Data.List                      ( nub )
+import           Data.List                      ( nub, intercalate )
 import           Data.Foldable
 import           Data.String
 import           Data.Text                      ( Text )
@@ -47,6 +47,7 @@ import           GHC.IO.Exception
 import qualified Data.ByteString               as B
 import qualified Data.ByteString.Lazy          as L
 import qualified Data.Strict.Maybe             as S
+import qualified Data.List.Split               as Split
 import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as E
 import qualified Data.Text.Encoding.Error      as E
@@ -190,14 +191,14 @@ hideError :: (MonadIO m, MonadCatch m) => IOErrorType -> m () -> m ()
 hideError err = handleIO (\e -> if err == ioeGetErrorType e then pure () else liftIO . ioError $ e)
 
 
-hideErrorDef :: [IOErrorType] -> a -> IO a -> IO a
+hideErrorDef :: (MonadIO m, MonadCatch m) => [IOErrorType] -> a -> m a -> m a
 hideErrorDef errs def =
-  handleIO (\e -> if ioeGetErrorType e `elem` errs then pure def else ioError e)
+  handleIO (\e -> if ioeGetErrorType e `elem` errs then pure def else liftIO $ ioError e)
 
 
-hideErrorDefM :: [IOErrorType] -> IO a -> IO a -> IO a
+hideErrorDefM :: (MonadIO m, MonadCatch m) => [IOErrorType] -> m a -> m a -> m a
 hideErrorDefM errs def =
-  handleIO (\e -> if ioeGetErrorType e `elem` errs then def else ioError e)
+  handleIO (\e -> if ioeGetErrorType e `elem` errs then def else liftIO $ ioError e)
 
 
 -- TODO: does this work?
@@ -334,12 +335,13 @@ copyDirectoryRecursive srcDir destDir = do
                    in doCopy src dest
                 | (srcBase, srcFile) <- srcFiles ]
 
-    -- | List all the files in a directory and all subdirectories.
+
-    --
+-- | List all the files in a directory and all subdirectories.
-    -- The order places files in sub-directories after all the files in their
+--
-    -- parent directories. The list is generated lazily so is not well defined if
+-- The order places files in sub-directories after all the files in their
-    -- the source directory structure changes before the list is used.
+-- parent directories. The list is generated lazily so is not well defined if
-    --
+-- the source directory structure changes before the list is used.
+--
 getDirectoryContentsRecursive :: FilePath -> IO [FilePath]
 getDirectoryContentsRecursive topdir = recurseDirectories [""]
   where
@@ -424,3 +426,19 @@ isNewLine w
   | w == _lf = True
   | w == _cr = True
   | otherwise = False
+
+
+-- | Split on a PVP suffix.
+--
+-- >>> splitOnPVP "-" "ghc-iserv-dyn-9.3.20210706" == ("ghc-iserv-dyn", "9.3.20210706")
+-- >>> splitOnPVP "-" "ghc-iserv-dyn"              == ("ghc-iserv-dyn", "")
+splitOnPVP :: String -> String -> (String, String)
+splitOnPVP c s = case Split.splitOn c s of
+  []  -> def
+  [_] -> def
+  xs
+    | let l = last xs
+    , (Right _) <- pvp (T.pack l) -> (intercalate c (init xs), l)
+    | otherwise -> def
+ where
+  def = (s, "")

www/ghcup.css

@@ -132,13 +132,17 @@ hr {
     margin-bottom: 2em;
 }
 
-#platform-instructions-linux > div > pre,
+span.code {
-#platform-instructions-mac > div > pre,
+	font-family: 'Lucida Console', monospace;
-#platform-instructions-freebsd > div > pre,
+}
-#platform-instructions-win32 > div > pre,
+
-#platform-instructions-win64 > div > pre,
+#platform-instructions-linux div > pre,
-#platform-instructions-default > div > div > pre,
+#platform-instructions-mac div > pre,
-#platform-instructions-unknown > div > div > pre {
+#platform-instructions-freebsd div > pre,
+#platform-instructions-win32 div > pre,
+#platform-instructions-win64 div > pre,
+#platform-instructions-default div > div > pre,
+#platform-instructions-unknown div > div > pre {
     background-color: #515151;
     color: white;
     margin-left: auto;

www/index.html

@@ -44,23 +44,40 @@
       <div id="platform-instructions-win32" class="instructions">
         <p>
             To install Haskell,<br/>run the following in a powershell session (as a non-admin user).
-			<div class="command-button"><pre><span class='ghcup-command' id="ghcup-command-powershell">Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-WebRequest -UseBasicParsing https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 | Invoke-Expression</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
+			<div>
+			<div class="command-button"><pre><span class='ghcup-command' id="ghcup-command-powershell">Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button>
+			</div>
+				<p class="other-help">If you want to run an interactive installation, change <span class='code'>$false</span> to <span class='code'>$true</span> at the end of the script.</p>
+			</div>
 		<p>If you're a Windows Subsystem 2 for Linux user run the following in your terminal, then follow the onscreen instructions to install Haskell.
 		</p>
-		<div class="command-button"><pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span></pre><button class="tooltip" onclick="copyToClipboard()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
+		<div>
+		<div class="command-button"><pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span></pre><button class="tooltip" onclick="copyToClipboard()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button>
+		</div>
+		<p class="other-help">WSL1 does not work with ghcup, follow  <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">the instructions here</a> to upgrade to WSL2 if needed.</p>
+		</div>
         </p>
-		<p class="other-help">WSL1 does not work with ghcup, follow  <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">the instructions here</a> to upgrade to WSL2 if needed.</br>You appear to be running Windows 32-bit. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
+        <hr/>
+		<p class="other-help">You appear to be running Windows 32-bit. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
       </div>
 
       <div id="platform-instructions-win64" class="instructions" style="display: none;">
         <p>
             To install Haskell,<br/>run the following in a powershell session (as a non-admin user).
-			<div class="command-button"><pre><span class='ghcup-command'>Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-WebRequest -UseBasicParsing https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 | Invoke-Expression</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
+			<div>
+			<div class="command-button"><pre><span class='ghcup-command'>Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button>
+			</div>
+				<p class="other-help">If you want to run an interactive installation, change <span class='code'>$false</span> to <span class='code'>$true</span> at the end of the script.</p>
+			</div>
         </p>
 		<p>If you're a Windows Subsystem 2 for Linux user run the following in your terminal, then follow the onscreen instructions to install Haskell.
 		</p>
-		<div class="command-button"><pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span></pre><button class="tooltip" onclick="copyToClipboard()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
+		<div>
-		<p class="other-help">WSL1 does not work with ghcup, follow  <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">the instructions here</a> to upgrade to WSL2 if needed.</br>You appear to be running Windows 64-bit. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
+		<div class="command-button"><pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span></pre><button class="tooltip" onclick="copyToClipboard()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button>
+		</div>
+		<p class="other-help">WSL1 does not work with ghcup, follow  <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">the instructions here</a> to upgrade to WSL2 if needed.</p>
+		</div>
+		<p class="other-help">You appear to be running Windows 64-bit. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
       </div>
 
       <div id="platform-instructions-unknown" class="instructions" style="display: none;">
@@ -92,7 +109,7 @@
         <div>
           <p>
             If you are running Windows,<br/>run the following in a powershell session (as a non-admin user).
-			<div class="command-button"><pre><span class='ghcup-command'>Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-WebRequest -UseBasicParsing https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 | Invoke-Expression</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
+			<div class="command-button"><pre><span class='ghcup-command'>Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
           </p>
         </div>
 
@@ -111,7 +128,7 @@
         <div>
           <p>
             If you are running Windows,<br/>run the following in a powershell session (as a non-admin user).
-			<div class="command-button"><pre><span class='ghcup-command'>Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-WebRequest -UseBasicParsing https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 | Invoke-Expression</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
+			<div class="command-button"><pre><span class='ghcup-command'>Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false</span></span></pre><button class="tooltip" onclick="copyToClipboardPowershell()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
           </p>
         </div>