Switch to github actions wrt #178 and #159

Fixes #118

.github/release.yaml

@@ -0,0 +1,109 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  draft_release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Changes in this Release
+            - First Change
+            - Second Change
+          draft: true
+          prerelease: false
+
+  release-mac:
+    name: Create Release for macOS
+    needs: draft_release
+    runs-on: ${{ matrix.os }}
+    env:
+      MACOSX_DEPLOYMENT_TARGET: 10.13
+    strategy:
+      matrix:
+        os:
+          - macOS-10.15
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - uses: haskell/actions/setup@v1.2
+        with:
+          ghc-version: 8.10.4
+          cabal-version: 3.4.0.0
+
+      - name: create ~/.local/bin
+        run: mkdir -p "$HOME/.local/bin"
+        shell: bash
+
+      - name: Add ~/.local/bin to PATH
+        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+        shell: bash
+
+      - name: Update cabal cache
+        run: cabal update
+        shell: bash
+
+      - name: Install cabal dependencies
+        run: cabal build --only-dependencies
+        shell: bash
+
+      - name: Build
+        run: cabal build -w ghc-${GHC_VERSION} --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" -ftui
+        shell: bash
+
+      - name: Install
+        run: cp "$(cabal list-bin exe:ghcup)" ~/.local/bin/ghcup
+        shell: bash
+
+      - name: Strip
+        run: strip ~/.local/bin/ghcup
+        shell: bash
+
+      - name: Run tests
+        run: cabal test --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" all
+        shell: bash
+
+      - name: Install git
+        run: brew install git
+
+      - name: set HOME
+        run: echo "HOME=$HOME" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Set ASSET_PATH
+        run: echo "ASSET_PATH=$HOME/.local/bin/ghcup" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.draft_release.outputs.upload_url }}
+          asset_path: ${{ env.ASSET_PATH }}
+          asset_name: ghcup-${{ matrix.os }}
+          asset_content_type: application/octet-stream
+
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: plan.json
+          path: ./dist-newstyle/cache/plan.json
+

.gitlab-ci.yml

@@ -41,7 +41,7 @@ variables:
     CABAL_DIR: "$CI_PROJECT_DIR/cabal"
 
 .linux:armv7:
-  image: "arm32v7/fedora"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
   tags:
     - armv7-linux
   variables:
@@ -50,7 +50,7 @@ variables:
     CABAL_DIR: "$CI_PROJECT_DIR/cabal"
 
 .linux:aarch64:
-  image: "arm64v8/fedora"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
   tags:
     - aarch64-linux
   variables:
@@ -124,14 +124,14 @@ variables:
     - .test_ghcup_version
     - .linux:armv7
   before_script:
-    - ./.gitlab/before_script/linux/install_deps_manual.sh
+    - ./.gitlab/before_script/linux/install_deps.sh
 
 .test_ghcup_version:aarch64:
   extends:
     - .test_ghcup_version
     - .linux:aarch64
   before_script:
-    - ./.gitlab/before_script/linux/install_deps_manual.sh
+    - ./.gitlab/before_script/linux/install_deps.sh
 
 .test_ghcup_version:darwin:
   extends:
@@ -374,7 +374,7 @@ release:linux:armv7:
     - .linux:armv7
     - .release_ghcup
   before_script:
-    - ./.gitlab/before_script/linux/install_deps_manual.sh
+    - ./.gitlab/before_script/linux/install_deps.sh
   variables:
     ARTIFACT: "armv7-linux-ghcup"
     GHC_VERSION: "8.10.4"
@@ -387,7 +387,7 @@ release:linux:aarch64:
     - .linux:aarch64
     - .release_ghcup
   before_script:
-    - ./.gitlab/before_script/linux/install_deps_manual.sh
+    - ./.gitlab/before_script/linux/install_deps.sh
   variables:
     ARTIFACT: "aarch64-linux-ghcup"
     GHC_VERSION: "8.10.4"

.gitlab/before_script/linux/install_deps.sh

@@ -7,13 +7,60 @@ set -eux
 mkdir -p "${TMPDIR}"
 
 sudo apt-get update -y
-sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget
+sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https
 
-curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > ./ghcup-bin
-chmod +x ghcup-bin
+case "${ARCH}" in
+	ARM*)
+		case "${ARCH}" in
+			"ARM")
+				ghc_url=https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-armv7-deb10-linux.tar.xz
+				cabal_url=home.smart-cactus.org/~ben/cabal-install-${CABAL_VERSION}-armv7-linux-bootstrapped.tar.xz
+				;;
+			"ARM64")
+				ghc_url=https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-aarch64-deb10-linux.tar.xz
+				cabal_url=https://downloads.haskell.org/~cabal/cabal-install-${CABAL_VERSION}/cabal-install-${CABAL_VERSION}-aarch64-ubuntu-18.04.tar.xz
+				;;
+			*)
+				exit 1 ;;
+		esac
 
-./ghcup-bin upgrade -i -f
-./ghcup-bin install ${GHC_VERSION}
-./ghcup-bin set ${GHC_VERSION}
-./ghcup-bin install-cabal ${CABAL_VERSION}
+		mkdir -p "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin
+
+		curl -O "${ghc_url}"
+		tar -xf ghc-*.tar.*
+		cd ghc-${GHC_VERSION}
+		./configure --prefix="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/ghc/${GHC_VERSION}
+		make install
+		for i in "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/ghc/${GHC_VERSION}/bin/*-${GHC_VERSION} ; do
+			ln -s "${i}" "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/${i##*/}
+		done
+		for x in "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/*-${GHC_VERSION} ; do
+			ln -s ${x##*/} ${x%-${GHC_VERSION}}
+		done
+		cd ..
+		rm -rf ghc-${GHC_VERSION} ghc-*.tar.*
+		unset x i
+
+		mkdir cabal-install
+		cd cabal-install
+		curl -O "${cabal_url}"
+		tar -xf cabal-install-*
+		mv cabal "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/cabal
+		cd ..
+		rm -rf cabal-install
+
+		;;
+	*) 
+		url=https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup
+
+		curl -sSfL "${url}" > ./ghcup-bin
+		chmod +x ghcup-bin
+
+		./ghcup-bin upgrade -i -f
+		./ghcup-bin install ${GHC_VERSION}
+		./ghcup-bin set ${GHC_VERSION}
+		./ghcup-bin install-cabal ${CABAL_VERSION}
+
+		;;
+esac
 

.gitlab/before_script/linux/install_deps_manual.sh

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-set -eux
-
-. "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"
-
-mkdir -p "${TMPDIR}"
-
-ednf() {
-	case "${ARCH}" in
-		"ARM")
-			sudo dnf -y --forcearch armv7hl "$@"
-			;;
-		"ARM64")
-			sudo dnf -y --forcearch aarch64 "$@"
-			;;
-		*) exit 1 ;;
-	esac
-}
-
-ednf update
-ednf install gcc gcc-c++ gmp gmp-devel make ncurses ncurses-devel xz xz-devel perl zlib zlib-devel openssl-devel openssl-libs openssl libffi libffi-devel lbzip2 lbzip2-utils bzip2-devel
-if [ "${ARCH}" = "ARM64" ] ; then
-	ednf install numactl numactl-libs numactl-devel
-fi
-ednf install bash wget curl git tar
-ednf install llvm9.0 llvm9.0-devel llvm9.0-libs llvm9.0-static
-
-case "${ARCH}" in
-	"ARM")
-		ghc_url=https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-armv7-deb10-linux.tar.xz
-		cabal_url=home.smart-cactus.org/~ben/cabal-install-${CABAL_VERSION}-armv7-linux-bootstrapped.tar.xz
-		;;
-	"ARM64")
-		ghc_url=https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-aarch64-deb10-linux.tar.xz
-		cabal_url=https://downloads.haskell.org/~cabal/cabal-install-${CABAL_VERSION}/cabal-install-${CABAL_VERSION}-aarch64-ubuntu-18.04.tar.xz
-		;;
-	*) exit 1 ;;
-esac
-
-mkdir -p "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin
-
-curl -O "${ghc_url}"
-tar -xf ghc-*.tar.*
-cd ghc-${GHC_VERSION}
-./configure --prefix="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/ghc/${GHC_VERSION}
-make install
-for i in "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/ghc/${GHC_VERSION}/bin/*-${GHC_VERSION} ; do
-	ln -s "${i}" "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/${i##*/}
-done
-for x in "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/*-${GHC_VERSION} ; do
-	ln -s ${x##*/} ${x%-${GHC_VERSION}}
-done
-cd ..
-rm -rf ghc-${GHC_VERSION} ghc-*.tar.*
-unset x i
-
-mkdir cabal-install
-cd cabal-install
-curl -O "${cabal_url}"
-tar -xf cabal-install-*
-mv cabal "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/cabal
-cd ..
-rm -rf cabal-install

.gitlab/ghcup_env

@@ -4,6 +4,6 @@ if [ "${OS}" = "WINDOWS" ] ; then
 	export TMPDIR="$CI_PROJECT_DIR/tmp"
 else
 	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-	export PATH="$CI_PROJECT_DIR/.ghcup/bin:$CI_PROJECT_DIR/.local/bin:$PATH"
+	export PATH="$CI_PROJECT_DIR/.ghcup/bin:$CI_PROJECT_DIR/.local/bin:/opt/llvm/bin:$PATH"
 	export TMPDIR="$CI_PROJECT_DIR/tmp"
 fi

.gitlab/script/ghcup_version.sh

@@ -84,8 +84,10 @@ ghcup-gen check -f ghcup-${JSON_VERSION}.yaml
 eghcup --numeric-version
 
 eghcup install ${GHC_VERSION}
+[ `$(eghcup whereis ghc ${GHC_VERSION}) --numeric-version` = "${GHC_VERSION}" ]
 eghcup set ${GHC_VERSION}
 eghcup install-cabal ${CABAL_VERSION}
+[ `$(eghcup whereis cabal ${CABAL_VERSION}) --numeric-version` = "${CABAL_VERSION}" ]
 
 cabal --version
 
@@ -125,10 +127,10 @@ else
 
 	if [ "${OS}" = "DARWIN" ] ; then
 		eghcup install hls
-		haskell-language-server-wrapper --version
+		$(eghcup whereis hls) --version
 
 		eghcup install stack
-		stack --version
+		$(eghcup whereis stack) --version
 	elif [ "${OS}" = "LINUX" ] ; then
 		if [ "${ARCH}" = "64" ] ; then
 			eghcup install hls

.travis.yml

@@ -1,37 +0,0 @@
-jobs:
-  include:
-    - os: osx
-      osx_image: xcode8
-      language: generic
-      env: ARTIFACT=x86_64-apple-darwin-10.11-ghcup
-
-    - os: osx
-      osx_image: xcode10.1
-      language: generic
-      env: ARTIFACT=x86_64-apple-darwin-10.13-ghcup
-
-    - os: osx
-      osx_image: xcode11.3
-      language: generic
-      env: ARTIFACT=x86_64-apple-darwin-10.14-ghcup
-
-  allow_failures:
-    - os: osx
-      osx_image: xcode8
-      language: generic
-      env: ARTIFACT=x86_64-apple-darwin-10.11-ghcup
-
-
-script: ".travis/build.sh"
-
-deploy:
-  provider: releases
-  api_key:
-    secure: GQESg4TcYf3PQJRRaZV/kWS0hsF+OFnH2+EcwpgnIcfx4+aogMyprdh745KtBXe1FlFN1luKHksFjqceqhcg/xcNyeCJiSnLWMn4D/i4WUperEHseRBi5yZZCB1AvOjIlHrE4DS3a8pyEm1GV3G7CKY5Fu8jBjof2SnyENfd7fofhjtNHWmeFS+jBn8HRDf1YaSRYxzTw6uHLrPLsybfgQZVl7babMu/38Ghin0f5pz5OlNokzDxaubIYQHOZ7st7YndHJtBWWql/KualBWbMILy88dUVQBnbqQLP2P8d1ME8ILUjJVqz33HiRU0JzlEJyWfbvEjcJ6iD8M6n4nXTaxfu3i2UhhGsQ6SSBNKssMP4tji8nkNpMqG59wLQ/zhcetEm71fKkgJNrIMNllkqlWSo5K74IqqP9kiLg/qm8ipOJjui0gPk8tZXKcV+ztX1d1OVCapoLfiDM5l/0LLQXaTOXOV1x3e5LLQ/w2doNiH3eh5CV4II9dRu7owpaiiMBHMssmT0pH99jEeF6giHLKtt3y7l2GWoRLPdhsZZ54gxsaBxZt9GuypmkbNcr97CEnAVaWij5v0CF3w4rAWqy/tAxQpIDJOIOQBgmwG5WrBAKyKrFvEpBL5a8BPcRWJDvqKC83QeWpvPrEVdgJevC6ZN1MKzrb2SiPOwC2Kerc=
-  file: $ARTIFACT
-  on:
-    repo: haskell/ghcup-hs
-    tags: true
-  skip_cleanup: true
-  draft: true
-

.travis/build.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-mkdir -p ~/.ghcup/bin
-curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ~/.ghcup/bin/ghcup
-chmod +x ~/.ghcup/bin/ghcup
-
-export PATH="$HOME/.ghcup/bin:$PATH"
-
-ghcup install 8.10.4
-ghcup install-cabal 3.4.0.0
-ghcup set 8.10.4
-
-
-## install ghcup
-
-cabal update
-
-(
-	cd /tmp
-	cabal install --installdir="$HOME"/.ghcup/bin hspec-discover
-)
-
-cabal build --constraint="zlib +static" --constraint="lzma +static" -ftui
-cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" .
-strip ./ghcup
-cp ghcup "./${ARTIFACT}"

HACKING.md

@@ -69,3 +69,7 @@ yaml files: `ghcup-<yaml-ver>.yaml`.
    Most of the `Version` parameters to functions had to be replaced with
    that and ensured the logic is consistent for cross and non-cross
    installs.
+2. This refactor added windows support wrt [#130](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/130).
+   The major changes here were switching `hpath` library out for `filepath`/`directory` (sadly) and
+   introducing a non-unix way of handling processes via the `process` library. It also introduced considerable
+   amounts of CPP wrt file handling, installation etc.

app/ghcup/Main.hs

@@ -100,6 +100,7 @@ data Command
   | Rm (Either RmCommand RmOptions)
   | DInfo
   | Compile CompileCommand
+  | Whereis WhereisOptions WhereisCommand
   | Upgrade UpgradeOpts Bool
   | ToolRequirements
   | ChangeLog ChangeLogOptions
@@ -190,6 +191,13 @@ data ChangeLogOptions = ChangeLogOptions
   }
 
 
+data WhereisCommand = WhereisTool Tool (Maybe ToolVersion)
+
+data WhereisOptions = WhereisOptions {
+   directory :: Bool
+}
+
+
 -- https://github.com/pcapriotti/optparse-applicative/issues/148
 
 -- | A switch that can be enabled using --foo and disabled using --no-foo.
@@ -335,6 +343,17 @@ com =
            <$> info (compileP <**> helper)
                     (progDesc "Compile a tool from source")
            )
+      <> command
+           "whereis"
+            (info
+             (   (Whereis
+                     <$> (WhereisOptions <$> switch (short 'd' <> long "directory" <> help "return directory of the binary instead of the binary location"))
+                     <*> whereisP
+                 ) <**> helper
+             )
+             (progDesc "Find a tools location"
+             <> footerDoc ( Just $ text whereisFooter ))
+           )
       <> commandGroup "Main commands:"
       )
     <|> subparser
@@ -402,6 +421,23 @@ com =
   By default returns the URI of the ChangeLog of the latest GHC release.
   Pass '-o' to automatically open via xdg-open.|]
 
+  whereisFooter :: String
+  whereisFooter = [s|Discussion:
+  Finds the location of a tool. For GHC, this is the ghc binary, that
+  usually resides in a self-contained "~/.ghcup/ghc/<ghcver>" directory.
+  For cabal/stack/hls this the binary usually at "~/.ghcup/bin/<tool>-<ver>".
+
+Examples:
+  # outputs ~/.ghcup/ghc/8.10.5/bin/ghc.exe
+  ghcup whereis ghc 8.10.5
+  # outputs ~/.ghcup/ghc/8.10.5/bin/
+  ghcup whereis --directory ghc 8.10.5
+  # outputs ~/.ghcup/bin/cabal-3.4.0.0
+  ghcup whereis cabal 3.4.0.0
+  # outputs ~/.ghcup/bin/
+  ghcup whereis --directory cabal 3.4.0.0|]
+
+
 installCabalFooter :: String
 installCabalFooter = [s|Discussion:
   Installs the specified cabal-install version (or a recommended default one)
@@ -706,6 +742,86 @@ Examples:
   ghcup compile ghc -j 4 -v 8.4.2 -b 8.2.2 -x armv7-unknown-linux-gnueabihf --config $(pwd)/build.mk -- --enable-unregisterised|]
 
 
+whereisP :: Parser WhereisCommand
+whereisP = subparser
+  (  command
+      "ghc"
+      (WhereisTool GHC <$> info
+        ( optional (toolVersionArgument Nothing (Just GHC)) <**> helper )
+        ( progDesc "Get GHC location"
+        <> footerDoc (Just $ text whereisGHCFooter ))
+      )
+      <>
+     command
+      "cabal"
+      (WhereisTool Cabal <$> info
+        ( optional (toolVersionArgument Nothing (Just Cabal)) <**> helper )
+        ( progDesc "Get cabal location"
+        <> footerDoc (Just $ text whereisCabalFooter ))
+      )
+      <>
+     command
+      "hls"
+      (WhereisTool HLS <$> info
+        ( optional (toolVersionArgument Nothing (Just HLS)) <**> helper )
+        ( progDesc "Get HLS location"
+        <> footerDoc (Just $ text whereisHLSFooter ))
+      )
+      <>
+     command
+      "stack"
+      (WhereisTool Stack <$> info
+        ( optional (toolVersionArgument Nothing (Just Stack)) <**> helper )
+        ( progDesc "Get stack location"
+        <> footerDoc (Just $ text whereisStackFooter ))
+      )
+      <>
+     command
+      "ghcup"
+      (WhereisTool GHCup <$> info ( (pure Nothing) <**> helper ) ( progDesc "Get ghcup location" ))
+  )
+ where
+  whereisGHCFooter = [s|Discussion:
+  Finds the location of a GHC executable, which usually resides in
+  a self-contained "~/.ghcup/ghc/<ghcver>" directory.
+
+Examples:
+  # outputs ~/.ghcup/ghc/8.10.5/bin/ghc.exe
+  ghcup whereis ghc 8.10.5
+  # outputs ~/.ghcup/ghc/8.10.5/bin/
+  ghcup whereis --directory ghc 8.10.5 |]
+
+  whereisCabalFooter = [s|Discussion:
+  Finds the location of a Cabal executable, which usually resides in
+  "~/.ghcup/bin/".
+
+Examples:
+  # outputs ~/.ghcup/bin/cabal-3.4.0.0
+  ghcup whereis cabal 3.4.0.0
+  # outputs ~/.ghcup/bin
+  ghcup whereis --directory cabal 3.4.0.0|]
+
+  whereisHLSFooter = [s|Discussion:
+  Finds the location of a HLS executable, which usually resides in
+  "~/.ghcup/bin/".
+
+Examples:
+  # outputs ~/.ghcup/bin/haskell-language-server-wrapper-1.2.0
+  ghcup whereis hls 1.2.0
+  # outputs ~/.ghcup/bin/
+  ghcup whereis --directory hls 1.2.0|]
+
+  whereisStackFooter = [s|Discussion:
+  Finds the location of a stack executable, which usually resides in
+  "~/.ghcup/bin/".
+
+Examples:
+  # outputs ~/.ghcup/bin/stack-2.7.1
+  ghcup whereis stack 2.7.1
+  # outputs ~/.ghcup/bin/
+  ghcup whereis --directory stack 2.7.1|]
+
+
 ghcCompileOpts :: Parser GHCCompileOptions
 ghcCompileOpts =
   GHCCompileOptions
@@ -1265,6 +1381,17 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
 #endif
                       ]
 
+          let
+            runWhereIs =
+              runLogger
+                . flip runReaderT appstate
+                . runE
+                  @'[ NotInstalled
+                    , NoToolVersionSet
+                    , NextVerNotFound
+                    , TagNotFound
+                    ]
+
           let runUpgrade =
                 runLogger
                   . flip runReaderT appstate
@@ -1628,6 +1755,22 @@ Make sure to clean up #{tmpdir} afterwards.|])
                         runLogger $ $(logError) $ T.pack $ prettyShow e
                         pure $ ExitFailure 9
 
+            Whereis WhereisOptions{..} (WhereisTool tool whereVer) ->
+              runWhereIs (do
+                (v, _) <- liftE $ fromVersion whereVer tool
+                loc <- liftE $ whereIsTool tool v
+                if directory
+                then pure $ takeDirectory loc
+                else pure loc
+                )
+                >>= \case
+                      VRight r -> do
+                        putStr r
+                        pure ExitSuccess
+                      VLeft e -> do
+                        runLogger $ $(logError) $ T.pack $ prettyShow e
+                        pure $ ExitFailure 30
+
             Upgrade uOpts force -> do
               target <- case uOpts of
                 UpgradeInplace  -> Just <$> liftIO getExecutablePath

bootstrap-haskell

@@ -5,8 +5,12 @@
 #   * BOOTSTRAP_HASKELL_NO_UPGRADE - any nonzero value to not trigger the upgrade
 #   * GHCUP_USE_XDG_DIRS - any nonzero value to respect The XDG Base Directory Specification
 #   * BOOTSTRAP_HASKELL_VERBOSE - any nonzero value for more verbose installation
-#   * BOOTSTRAP_HASKELL_GHC_VERSION
-#   * BOOTSTRAP_HASKELL_CABAL_VERSION
+#   * BOOTSTRAP_HASKELL_GHC_VERSION - the ghc version to install
+#   * BOOTSTRAP_HASKELL_CABAL_VERSION - the cabal version to install
+#   * BOOTSTRAP_HASKELL_INSTALL_STACK - whether to install latest stack
+#   * BOOTSTRAP_HASKELL_INSTALL_HLS - whether to install latest hls
+#   * BOOTSTRAP_HASKELL_ADJUST_BASHRC - whether to adjust PATH in bashrc (prepend)
+#   * BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG - whether to adjust mingw paths in cabal.config on windows
 
 # License: LGPL-3.0
 
@@ -19,6 +23,8 @@ arch=$(uname -m)
 ghver="0.1.15.2"
 base_url="https://downloads.haskell.org/~ghcup"
 
+export GHCUP_SKIP_UPDATE_CHECK=yes
+
 case "${plat}" in
         MSYS*|MINGW*)
 			: "${GHCUP_INSTALL_BASE_PREFIX:=/c}"
@@ -60,6 +66,28 @@ warn() {
 	esac
 }
 
+yellow() {
+	case "${plat}" in
+			MSYS*|MINGW*)
+				echo -e "\\033[0;33m$1\\033[0m"
+				;;
+			*)
+				printf "\\033[0;33m%s\\033[0m\\n" "$1"
+				;;
+	esac
+}
+
+green() {
+	case "${plat}" in
+			MSYS*|MINGW*)
+				echo -e "\\033[0;32m$1\\033[0m"
+				;;
+			*)
+				printf "\\033[0;32m%s\\033[0m\\n" "$1"
+				;;
+	esac
+}
+
 edo() {
     "$@" || die "\"$*\" failed!"
 }
@@ -80,40 +108,42 @@ _eghcup() {
 }
 
 _done() {
+	echo
+	echo "==============================================================================="
 	case "${plat}" in
 			MSYS*|MINGW*)
-				echo
-				echo "All done!"
-				echo
-				echo "In a new powershell or cmd.exe session, now you can..."
-				echo
-				echo "Start a simple repl via:"
-				echo "  ghci"
-				echo
-				echo "Start a new haskell project in the current directory via:"
-				echo "  cabal init --interactive"
-				echo
-				echo "Install other GHC versions and tools via:"
-				echo "  ghcup list"
-				echo "  ghcup install <tool> <version>"
-				echo
-				echo "To install system libraries and update msys2/mingw64,"
-				echo "open the \"Mingw haskell shell\""
-				echo "and the \"Mingw package management docs\""
-				echo "desktop shortcuts."
+				green
+				green "All done!"
+				green
+				green "In a new powershell or cmd.exe session, now you can..."
+				green
+				green "Start a simple repl via:"
+				green "  ghci"
+				green
+				green "Start a new haskell project in the current directory via:"
+				green "  cabal init --interactive"
+				green
+				green "Install other GHC versions and tools via:"
+				green "  ghcup list"
+				green "  ghcup install <tool> <version>"
+				green
+				green "To install system libraries and update msys2/mingw64,"
+				green "open the \"Mingw haskell shell\""
+				green "and the \"Mingw package management docs\""
+				green "desktop shortcuts."
 				;;
 			*)
-				echo
-				echo "All done!"
-				echo
-				echo "To start a simple repl, run:"
-				echo "  ghci"
-				echo
-				echo "To start a new haskell project in the current directory, run:"
-				echo "  cabal init --interactive"
-				echo
-				echo "To install other GHC versions and tools, run:"
-				echo "  ghcup tui"
+				green
+				green "All done!"
+				green
+				green "To start a simple repl, run:"
+				green "  ghci"
+				green
+				green "To start a new haskell project in the current directory, run:"
+				green "  cabal init --interactive"
+				green
+				green "To install other GHC versions and tools, run:"
+				green "  ghcup tui"
 				;;
 
 	esac
@@ -201,16 +231,21 @@ download_ghcup() {
 			;;
 	esac
 
-  edo mkdir -p "${GHCUP_DIR}"
+	edo mkdir -p "${GHCUP_DIR}"
+
+	# we may overwrite this in adjust_bashrc
 	cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
 		export PATH="\$HOME/.cabal/bin:${GHCUP_BIN}:\$PATH"
 		EOF
+
 	# shellcheck disable=SC1090
     edo . "${GHCUP_DIR}"/env
     eghcup upgrade
 }
 
-adjust_bashrc() {
+# Figures out the users login shell and sets
+# GHCUP_PROFILE_FILE and MY_SHELL variables.
+find_shell() {
 	case $SHELL in
 		*/zsh) # login shell is zsh
 			GHCUP_PROFILE_FILE="$HOME/.zshrc"
@@ -234,66 +269,259 @@ adjust_bashrc() {
 			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 ""
+# Ask user if they want to adjust the bashrc.
+ask_bashrc() {
+	if [ -n "${BOOTSTRAP_HASKELL_ADJUST_BASHRC}" ] ; then
+		return 1
+	fi
 
 	while true; do
 		if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
-			read -r next_answer </dev/tty
+			echo "-------------------------------------------------------------------------------"
+
+			warn ""
+			warn "Detected ${MY_SHELL} shell on your system..."
+			warn "Do you want ghcup to automatically add the required PATH variable to \"${GHCUP_PROFILE_FILE}\"?"
+			warn ""
+			warn "[P] Yes, prepend  [A] Yes, append  [N] No  [?] Help (default is \"P\")."
+			warn ""
+
+			read -r bashrc_answer </dev/tty
 		else
-			next_answer="yes"
+			return 1
 		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
+		case $bashrc_answer in
+			[Pp]* | "")
+				return 1
 				;;
+			[Aa]*)
+				return 2
+				;;
+			[Nn]*)
+				return 0;;
 			*)
 				echo "Possible choices are:"
 				echo
-				echo "Y - Yes, update my \"${GHCUP_PROFILE_FILE}\" (default)"
+				echo "P - Yes, prepend to PATH, taking precedence (default)"
+				echo "A - Yes, append to PATH"
 				echo "N - No, don't mess with my configuration"
 				echo
 				echo "Please make your choice and press ENTER."
 				;;
 		esac
 	done
+
+	unset bashrc_answer
 }
 
+# Needs 'find_shell' to be called beforehand.
+adjust_bashrc() {
+	case $1 in
+		1)
+			cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
+				export PATH="\$HOME/.cabal/bin:${GHCUP_BIN}:\$PATH"
+				EOF
+			;;
+		2)
+			cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
+				export PATH="\$HOME/.cabal/bin:\$PATH:${GHCUP_BIN}"
+				EOF
+			;;
+		*) ;;
+	esac
+
+	case $1 in
+		1 | 2)
+			case $MY_SHELL in
+				"") break ;;
+				fish)
+					mkdir -p "${GHCUP_PROFILE_FILE%/*}"
+					sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
+					case $1 in
+						1)
+							echo "set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX \$HOME ; set -gx PATH \$HOME/.cabal/bin $GHCUP_BIN \$PATH # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+							;;
+						2)
+							echo "set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX \$HOME ; set -gx PATH \$HOME/.cabal/bin \$PATH $GHCUP_BIN # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+							;;
+					esac
+					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
+			;;
+		*)
+			;;
+	esac
+}
+
+adjust_cabal_config() {
+	edo cabal user-config -a "extra-prog-path: $(cygpath -w "$GHCUP_BIN"), $(cygpath -w "$HOME"/AppData/Roaming/cabal/bin), $(cygpath -w "$GHCUP_MSYS2"/usr/bin), $(cygpath -w "$GHCUP_MSYS2"/mingw64/bin)" -a "extra-include-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/include)" -a "extra-lib-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/lib)" -f init
+}
+
+ask_cabal_config_init() {
+	case "${plat}" in
+			MSYS*|MINGW*)
+				if [ -n "${BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG}" ] ; then
+					return 1
+				fi
+
+				if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
+					echo "-------------------------------------------------------------------------------"
+					warn "Create an initial cabal.config including relevant msys2 paths (recommended)?"
+					warn "[Y] Yes  [N] No  [?] Help (default is \"Y\")."
+					echo
+					while true; do
+						read -r mingw_answer </dev/tty
+
+						case $mingw_answer in
+							[Yy]* | "")
+								return 1 ;;
+							[Nn]*)
+								return 0 ;;
+							*)
+								echo "Possible choices are:"
+								echo
+								echo "Y - Yes, create a cabal.config with pre-set paths to msys2/mingw64 (default)"
+								echo "N - No, leave the current/default cabal config untouched"
+								echo
+								echo "Please make your choice and press ENTER."
+								;;
+						esac
+					done
+				else
+					return 1
+				fi
+				;;
+	esac
+
+	unset mingw_answer
+
+    return 0
+}
+
+do_cabal_config_init() {
+	case "${plat}" in
+			MSYS*|MINGW*)
+		case $1 in
+			1)
+				adjust_cabal_config
+				;;
+			0)
+				echo "Make sure that your global cabal.config references the correct mingw64 paths (extra-prog-path, extra-include-dirs and extra-lib-dirs)."
+				echo "And set the environment variable GHCUP_MSYS2 to the root path of your msys2 installation."
+				sleep 5
+				return ;;
+			*) ;;
+		esac
+	esac
+}
+
+ask_hls() {
+	if [ -n "${BOOTSTRAP_HASKELL_INSTALL_HLS}" ] ; then
+		return 1
+	fi
+
+	if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
+		echo "-------------------------------------------------------------------------------"
+
+		warn "Do you want to install haskell-language-server (HLS)?"
+		warn "HLS is a language-server that provides IDE-like functionality"
+		warn "and can integrate with different editors, such as Vim, Emacs, VS Code, Atom, ..."
+		warn "Also see https://github.com/haskell/haskell-language-server/blob/master/README.md"
+		warn ""
+		warn "[Y] Yes  [N] No  [?] Help (default is \"N\")."
+		warn ""
+
+		while true; do
+			read -r hls_answer </dev/tty
+
+			case $hls_answer in
+				[Yy]*)
+					return 1
+					;;
+				[Nn]* | "")
+					return 0
+					;;
+				*)
+					echo "Possible choices are:"
+					echo
+					echo "Y - Yes, install the haskell-langauge-server"
+					echo "N - No, don't install anything more (default)"
+					echo
+					echo "Please make your choice and press ENTER."
+					;;
+			esac
+		done
+	else
+		return 0
+	fi
+
+	unset hls_answer
+}
+
+ask_stack() {
+	if [ -n "${BOOTSTRAP_HASKELL_INSTALL_STACK}" ] ; then
+		return 1
+	fi
+
+	if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
+		echo "-------------------------------------------------------------------------------"
+
+		warn "Do you want to install stack?"
+		warn "Stack is a haskell build tool similar to cabal that is used by some projects."
+		warn "Also see https://docs.haskellstack.org/"
+		warn ""
+		warn "[Y] Yes  [N] No  [?] Help (default is \"N\")."
+		warn ""
+
+		while true; do
+			read -r stack_answer </dev/tty
+
+			case $stack_answer in
+				[Yy]*)
+					return 1 ;;
+				[Nn]* | "")
+					return 0 ;;
+				*)
+					echo "Possible choices are:"
+					echo
+					echo "Y - Yes, install stack"
+					echo "N - No, don't install anything more (default)"
+					echo
+					echo "Please make your choice and press ENTER."
+					;;
+			esac
+		done
+	else
+		return 0
+	fi
+
+	unset stack_answer
+}
+
+
+find_shell
+
 
 echo
 echo "Welcome to Haskell!"
@@ -325,12 +553,20 @@ echo
 if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
     warn "Press ENTER to proceed or ctrl-c to abort."
     warn "Note that this script can be re-run at any given time."
-    echo
     # Wait for user input to continue.
     # shellcheck disable=SC2034
     read -r answer </dev/tty
 fi
 
+ask_bashrc
+ask_bashrc_answer=$?
+ask_cabal_config_init
+ask_cabal_config_init_answer=$?
+ask_hls
+ask_hls_answer=$?
+ask_stack
+ask_stack_answer=$?
+
 edo mkdir -p "${GHCUP_BIN}"
 
 if command -V "ghcup" >/dev/null 2>&1 ; then
@@ -360,118 +596,52 @@ eghcup --cache install ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"
 eghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}"
 eghcup --cache install cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
 
-adjust_cabal_config() {
-	edo cabal user-config -a "extra-prog-path: $(cygpath -w "$GHCUP_BIN"), $(cygpath -w "$HOME"/AppData/Roaming/cabal/bin), $(cygpath -w "$GHCUP_MSYS2"/usr/bin), $(cygpath -w "$GHCUP_MSYS2"/mingw64/bin)" -a "extra-include-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/include)" -a "extra-lib-dirs: $(cygpath -w "$GHCUP_MSYS2"/mingw64/lib)" -f init
-}
-
-case "${plat}" in
-        MSYS*|MINGW*)
-			if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
-				warn "Create an initial cabal.config including relevant msys2 paths (recommended)?"
-				warn "[Y] Yes  [N] No  [?] Help (default is \"Y\")."
-				echo
-				while true; do
-					read -r mingw_answer </dev/tty
-
-					case $mingw_answer in
-						[Yy]* | "")
-							adjust_cabal_config
-							break ;;
-						[Nn]*)
-							echo "Make sure that your global cabal.config references the correct mingw64 paths (extra-prog-path, extra-include-dirs and extra-lib-dirs)."
-							echo "And set the environment variable GHCUP_MSYS2 to the root path of your msys2 installation."
-							sleep 5
-							break ;;
-						*)
-							echo "Possible choices are:"
-							echo
-							echo "Y - Yes, create a cabal.config with pre-set paths to msys2/mingw64 (default)"
-							echo "N - No, leave the current/default cabal config untouched"
-							echo
-							echo "Please make your choice and press ENTER."
-							;;
-					esac
-				done
-			else
-				adjust_cabal_config
-			fi
-			;;
-esac
-
+do_cabal_config_init $ask_cabal_config_init_answer
 
 edo cabal new-update
 
+case $ask_hls_answer in
+	1)
+		_eghcup --cache install hls || warn "HLS installation failed, continuing anyway"
+		;;
+	*) ;;
+esac
 
-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"
-	warn "and can integrate with different editors, such as Vim, Emacs, VS Code, Atom, ..."
-	warn "Also see https://github.com/haskell/haskell-language-server/blob/master/README.md"
-	warn ""
-	warn "[Y] Yes  [N] No  [?] Help (default is \"N\")."
-	warn ""
+case $ask_stack_answer in
+	1)
+		_eghcup --cache install stack || warn "Stack installation failed, continuing anyway"
+		;;
+	*) ;;
+esac
 
-	while true; do
-		read -r hls_answer </dev/tty
 
-		case $hls_answer in
-			[Yy]*)
-				eghcup --cache install hls || warn "HLS installation failed, continuing anyway"
-				break ;;
-			[Nn]* | "")
-				break ;;
-			*)
-				echo "Possible choices are:"
-				echo
-				echo "Y - Yes, install the haskell-langauge-server"
-				echo "N - No, don't install anything more (default)"
-				echo
-				echo "Please make your choice and press ENTER."
-				;;
-		esac
-	done
-
-	warn "Do you want to install stack now?"
-	warn "Stack is a haskell build tool similar to cabal that is used by some projects."
-	warn "Also see https://docs.haskellstack.org/"
-	warn ""
-	warn "[Y] Yes  [N] No  [?] Help (default is \"N\")."
-	warn ""
-
-	while true; do
-		read -r stack_answer </dev/tty
-
-		case $stack_answer in
-			[Yy]*)
-				eghcup --cache install stack || warn "Stack installation failed, continuing anyway"
-				break ;;
-			[Nn]* | "")
-				break ;;
-			*)
-				echo "Possible choices are:"
-				echo
-				echo "Y - Yes, install stack"
-				echo "N - No, don't install anything more (default)"
-				echo
-				echo "Please make your choice and press ENTER."
-				;;
-		esac
-	done
-fi
 
 # short-circuit script based on platform
 case "${plat}" in
         MSYS*|MINGW*)
 			# For windows we always adjust bashrc, since it's inside msys2
-			adjust_bashrc
+			adjust_bashrc $adjust_bashrc_answer
 			;;
 		*)
         	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)."
-
-				adjust_bashrc
+				case $ask_bashrc_answer in
+					1 | 2)
+						echo
+						echo "==============================================================================="
+						echo
+						yellow "In order to run ghc and cabal, start a new shell or"
+						yellow "run 'source $GHCUP_DIR/env' in your current shell session."
+						adjust_bashrc $adjust_bashrc_answer
+						;;
+					*)
+						echo
+						echo "==============================================================================="
+						echo
+						yellow "In order to run ghc and cabal, you need to adjust your PATH variable."
+						yellow "You may want to source '$GHCUP_DIR/env' in your shell"
+						yellow "configuration to do so (e.g. ~/.bashrc)."
+						;;
+				esac
 			fi
 			;;
 esac

bootstrap-haskell.ps1

@@ -26,7 +26,13 @@ param (
     # 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
+    [switch]$InBash,
+    # Whether to install stack as well
+    [switch]$InstallStack,
+    # Whether to install hls as well
+    [switch]$InstallHLS,
+    # Skip adjusting cabal.config with mingw paths
+    [switch]$NoAdjustCabalConfig
 )
 
 $Silent = !$Interactive
@@ -178,6 +184,7 @@ if ($GhcupBasePrefixEnv) {
   }
 }
 
+# ask for base install prefix
 if ($Silent -and !($InstallDir)) {
   $GhcupBasePrefix = $defaultGhcupBasePrefix
 } elseif ($InstallDir) {
@@ -225,6 +232,7 @@ $GhcupMsys2 = [System.Environment]::GetEnvironmentVariable('GHCUP_MSYS2', 'user'
 
 Print-Msg -msg 'Preparing for GHCup installation...'
 
+# ask what to do in case ghcup is already installed
 if (Test-Path -LiteralPath ('{0}' -f $GhcupDir)) {
   Print-Msg -msg ('GHCup already installed at ''{0}''...' -f $GhcupDir)
   if ($Overwrite) {
@@ -254,8 +262,73 @@ if (Test-Path -LiteralPath ('{0}' -f $GhcupDir)) {
 $null = New-Item -Path ('{0}' -f $GhcupDir) -ItemType 'directory' -ErrorAction SilentlyContinue
 $null = New-Item -Path ('{0}' -f $GhcupDir) -Name 'bin' -ItemType 'directory' -ErrorAction SilentlyContinue
 
-Print-Msg -msg 'First checking for Msys2...'
+# ask for cabal dir destination
+if ($CabalDir) {
+  $CabDirEnv = $CabalDir
+  if (!($CabDirEnv)) {
+    Print-Msg -color Red -msg "No directory specified!"
+    Exit 1        
+  } elseif (!(Split-Path -IsAbsolute -Path "$CabDirEnv")) {
+    Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
+    Exit 1
+  }
+} elseif (!($Silent)) {
+  while ($true) {
 
+    $defaultCabalDir = ('{0}\cabal' -f $GhcupBasePrefix)
+    Print-Msg -color Magenta -msg ('Specify Cabal directory (this is where haskell packages end up). Press enter to accept the default [{0}]:' -f $defaultCabalDir)
+    $CabalDirPrompt = Read-Host
+    $CabDirEnv = ($defaultCabalDir,$CabalDirPrompt)[[bool]$CabalDirPrompt]
+
+    if (!($CabDirEnv)) {
+      Print-Msg -color Red -msg "No directory specified!"         
+    } elseif (!(Split-Path -IsAbsolute -Path "$CabDirEnv")) {
+      Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
+    } else {
+      Break
+    }
+  }
+} else {
+  $CabDirEnv = ('{0}\cabal' -f $GhcupBasePrefix)
+}
+
+# ask whether to install HLS
+if (!($InstallHLS)) {
+  if (!($Silent)) {
+    $HLSdecision = $Host.UI.PromptForChoice('Install HLS'
+      , 'Do you want to install the haskell-language-server (HLS) for development purposes as well?'
+      , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
+          '&No'
+          '&Abort'), 1)
+
+    if ($HLSdecision -eq 0) {
+      $InstallHLS = $true
+    } elseif ($HLSdecision -eq 2) {
+      Exit 0
+    }
+  }
+}
+
+# ask whether to install stack
+if (!($InstallStack)) {
+  if (!($Silent)) {
+    $StackDecision = $Host.UI.PromptForChoice('Install stack'
+      , 'Do you want to install stack as well?'
+      , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
+          '&No'
+          '&Abort'), 1)
+
+    if ($StackDecision -eq 0) {
+      $InstallStack = $true
+    } elseif ($StackDecision -eq 2) {
+      Exit 0
+    }
+  }
+}
+
+
+# mingw foo
+Print-Msg -msg 'First checking for Msys2...'
 if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
   if ($Silent) {
     $msys2Decision = 0
@@ -267,7 +340,10 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
   }
 
   if ($msys2Decision -eq 0) {
-    Print-Msg -msg ('...Msys2 doesn''t exist, installing into {0} ...this may take a while' -f $MsysDir)
+    Print-Msg -msg ('...Msys2 doesn''t exist, installing into {0}' -f $MsysDir)
+
+	Print-Msg -msg 'Starting installation in 5 seconds, this may take a while...'
+	Start-Sleep -s 5
 
     # Download the archive
     Print-Msg -msg 'Downloading Msys2 archive...'
@@ -330,6 +406,9 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
   }
 } else {
     Print-Msg -msg ('...Msys2 found in {0} ...skipping Msys2 installation.' -f $MsysDir)
+
+	Print-Msg -msg 'Starting installation in 5 seconds, this may take a while...'
+	Start-Sleep -s 5
 }
 
 Print-Msg -msg 'Creating shortcuts...'
@@ -342,34 +421,7 @@ Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -Argu
 Print-Msg -msg ('Adding {0}\bin to Users Path...' -f $GhcupDir)
 Add-EnvPath -Path ('{0}\bin' -f ([System.IO.Path]::GetFullPath("$GhcupDir"))) -Container 'User'
 
-if ($CabalDir) {
-  $CabDirEnv = $CabalDir
-  if (!($CabDirEnv)) {
-    Print-Msg -color Red -msg "No directory specified!"
-    Exit 1        
-  } elseif (!(Split-Path -IsAbsolute -Path "$CabDirEnv")) {
-    Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
-    Exit 1
-  }
-} elseif (!($Silent)) {
-  while ($true) {
 
-    $defaultCabalDir = ('{0}\cabal' -f $GhcupBasePrefix)
-    Print-Msg -color Magenta -msg ('Specify Cabal directory (this is where haskell packages end up). Press enter to accept the default [{0}]:' -f $defaultCabalDir)
-    $CabalDirPrompt = Read-Host
-    $CabDirEnv = ($defaultCabalDir,$CabalDirPrompt)[[bool]$CabalDirPrompt]
-
-    if (!($CabDirEnv)) {
-      Print-Msg -color Red -msg "No directory specified!"         
-    } elseif (!(Split-Path -IsAbsolute -Path "$CabDirEnv")) {
-      Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
-    } else {
-      Break
-    }
-  }
-} else {
-  $CabDirEnv = ('{0}\cabal' -f $GhcupBasePrefix)
-}
 
 $CabalDirFull = [System.IO.Path]::GetFullPath("$CabDirEnv")
 Print-Msg -msg ('Setting CABAL_DIR to ''{0}''' -f $CabalDirFull)
@@ -379,16 +431,25 @@ Print-Msg -msg 'Starting GHCup installer...'
 
 $Msys2Shell = ('{0}\msys2_shell.cmd' -f $MsysDir)
 
-if ($Silent) {
-  $SilentExport = 'export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 ;'
-} else {
-  $SilentExport = ''
+# The bootstrap script is always silent, since we ask relevant questions here
+$SilentExport = 'export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 ;'
+
+if ($InstallStack) {
+  $StackInstallExport = 'export BOOTSTRAP_HASKELL_INSTALL_STACK=1 ;'
+}
+
+if ($InstallHLS) {
+  $HLSInstallExport = 'export BOOTSTRAP_HASKELL_INSTALL_HLS=1 ;'
+}
+
+if (!($NoAdjustCabalConfig)) {
+  $AdjustCabalConfigExport = 'export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=1 ;'
 }
 
 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}'' ; [[ ''{0}'' = https* ]]  && curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash || cat $(cygpath -m ''{0}'') | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
+  Exec "$Bash" '-lc' ('{4} {6} {7} {8} [ -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, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport)
 } 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 ; [[ ''{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)
+  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} {6} {7} {8} [ -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, $StackInstallExport, $HLSInstallExport, $AdjustCabalConfigExport)
 }
 
 
@@ -420,3 +481,5 @@ if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell") -Or $InBa
 
 
 
+
+

cabal.ghc8104.project

@@ -1,20 +0,0 @@
-packages: ./ghcup.cabal
-
-with-compiler: ghc-8.10.4
-
-optional-packages: ./3rdparty/*/*.cabal
-
-optimization: 2
-
-package streamly
-    ghc-options: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
-
-package ghcup
-    ghc-options: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
-
-constraints: http-io-streams -brotli
-
-package libarchive
-  flags: -system-libarchive
-
-allow-newer: base, ghc-prim, template-haskell

cabal.ghc8105.project

@@ -0,0 +1,28 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+optimization: 2
+
+package ghcup
+    tests: True
+    flags: +tui
+
+source-repository-package
+    type: git
+    location: https://github.com/Bodigrim/tar
+    tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf
+
+source-repository-package
+    type: git
+    location: https://github.com/bgamari/terminal-size
+    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
+
+constraints: http-io-streams -brotli
+
+package libarchive
+  flags: -system-libarchive
+
+allow-newer: base, ghc-prim, template-haskell, language-c
+
+with-compiler: ghc-8.10.5

cabal.ghc8105.project.freeze

@@ -1,12 +1,11 @@
 active-repositories: hackage.haskell.org:merge
 constraints: any.Cabal ==3.2.1.0,
              any.HUnit ==1.6.2.0,
-             any.IfElse ==0.85,
+             any.HsOpenSSL ==0.11.7,
+             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
              any.QuickCheck ==2.14.2,
              QuickCheck -old-random +templatehaskell,
              any.StateVar ==1.2.1,
-             any.abstract-deque ==0.3,
-             abstract-deque -usecas,
              any.aeson ==1.5.6.0,
              aeson -bytestring-builder -cffi -developer -fast,
              any.aeson-pretty ==0.8.8,
@@ -18,31 +17,32 @@ constraints: any.Cabal ==3.2.1.0,
              any.ansi-wl-pprint ==0.6.9,
              ansi-wl-pprint -example,
              any.array ==0.5.4.0,
-             any.ascii-string ==1.0.1.4,
              any.assoc ==1.0.2,
              any.async ==2.2.3,
              async -bench,
-             any.atomic-primops ==0.8.4,
-             atomic-primops -debug,
              any.attoparsec ==0.13.2.5,
              attoparsec -developer,
              any.auto-update ==0.1.6,
-             any.base ==4.14.1.0,
+             any.base ==4.14.2.0,
              any.base-compat ==0.11.2,
              any.base-compat-batteries ==0.11.2,
              any.base-orphans ==0.8.4,
              any.base16-bytestring ==1.0.1.0,
-             any.base64-bytestring ==1.2.0.1,
-             any.bifunctors ==5.5.10,
+             any.base64-bytestring ==1.1.0.0,
+             any.bifunctors ==5.5.11,
              bifunctors +semigroups +tagged,
              any.binary ==0.8.8.0,
+             any.bindings-DSL ==1.0.25,
              any.blaze-builder ==0.4.2.1,
+             any.brick ==0.61,
+             brick -demos,
              any.bytestring ==0.10.12.0,
              any.bz2 ==1.0.1.0,
              bz2 -cross +with-bzlib,
-             any.c2hs ==0.28.7,
+             any.bzlib-conduit ==0.3.0.2,
+             any.c2hs ==0.28.8,
              c2hs +base3 -regression,
-             any.call-stack ==0.3.0,
+             any.call-stack ==0.4.0,
              any.case-insensitive ==1.2.1.0,
              any.casing ==0.1.4.1,
              any.cereal ==0.5.8.1,
@@ -54,7 +54,7 @@ constraints: any.Cabal ==3.2.1.0,
              clock -llvm,
              any.cmdargs ==0.10.21,
              cmdargs +quotation -testprog,
-             any.colour ==2.3.5,
+             any.colour ==2.3.6,
              any.comonad ==5.0.8,
              comonad +containers +distributive +indexed-traversable,
              any.composition-prelude ==3.0.0.2,
@@ -62,16 +62,25 @@ constraints: any.Cabal ==3.2.1.0,
              any.concurrent-output ==1.10.12,
              any.conduit ==1.3.4.1,
              any.conduit-extra ==1.3.5,
-             any.containers ==0.6.2.1,
+             any.conduit-zstd ==0.0.2.0,
+             any.config-ini ==0.2.4.0,
+             config-ini -enable-doctests,
+             any.containers ==0.6.4.1,
              any.contravariant ==1.5.3,
              contravariant +semigroups +statevar +tagged,
+             any.cpphs ==1.20.9.1,
+             cpphs -old-locale,
+             any.cryptohash-sha1 ==0.11.100.1,
              any.cryptohash-sha256 ==0.11.102.0,
              cryptohash-sha256 -exe +use-cbits,
+             any.data-clist ==0.1.2.3,
              any.data-default-class ==0.1.2.0,
              any.data-fix ==0.3.1,
              any.deepseq ==1.4.4.0,
-             any.deferred-folds ==0.9.17,
+             any.digest ==0.0.1.3,
+             digest -bytestring-in-base,
              any.directory ==1.3.6.0,
+             any.disk-free-space ==0.1.0.1,
              any.distributive ==0.6.2.1,
              distributive +semigroups +tagged,
              any.dlist ==1.0,
@@ -79,62 +88,55 @@ constraints: any.Cabal ==3.2.1.0,
              any.easy-file ==0.2.2,
              any.errors ==2.3.0,
              any.exceptions ==0.10.4,
-             any.fast-logger ==3.0.3,
+             any.extra ==1.7.9,
+             any.fast-logger ==3.0.5,
              any.filepath ==1.4.2.1,
-             any.focus ==1.0.2,
-             any.foldl ==1.4.11,
-             any.free ==5.1.6,
-             any.fusion-plugin-types ==0.1.0,
+             any.free ==5.1.7,
              any.generic-arbitrary ==0.1.0,
              any.generics-sop ==0.5.1.1,
-             any.ghc-boot-th ==8.10.4,
+             any.ghc-boot-th ==8.10.5,
+             any.ghc-byteorder ==4.11.0.0.10,
              any.ghc-prim ==0.6.1,
-             ghcup -internal-downloader -tar -tui,
              any.happy ==1.20.0,
-             any.hashable ==1.3.1.0,
-             hashable +integer-gmp,
+             any.hashable ==1.3.2.0,
+             hashable +integer-gmp -random-initial-seed,
              any.haskell-src-exts ==1.23.1,
              any.haskell-src-meta ==0.8.7,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
              any.haskus-utils-variant ==3.1,
-             any.heaps ==0.3.6.1,
-             any.hpath ==0.11.0,
-             any.hpath-directory ==0.14.1,
              any.hpath-filepath ==0.10.4,
-             any.hpath-io ==0.14.1,
-             any.hpath-posix ==0.13.2,
+             any.hpath-posix ==0.13.3,
              any.hsc2hs ==0.68.7,
              hsc2hs -in-ghc-tree,
-             any.hspec ==2.7.8,
-             any.hspec-core ==2.7.8,
-             any.hspec-discover ==2.7.8,
+             any.hspec ==2.7.10,
+             any.hspec-core ==2.7.10,
+             any.hspec-discover ==2.7.10,
              any.hspec-expectations ==0.8.2,
-             any.hspec-golden-aeson ==0.7.0.0,
-             any.indexed-profunctors ==0.1,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.http-io-streams ==0.1.6.0,
+             http-io-streams -brotli +fast-xor,
+             any.indexed-profunctors ==0.1.1,
              any.indexed-traversable ==0.1.1,
              any.indexed-traversable-instances ==0.1,
              any.integer-gmp ==1.0.3.0,
              any.integer-logarithms ==1.0.3.1,
              integer-logarithms -check-bounds +integer-gmp,
-             any.language-c ==0.8.3,
-             language-c -allwarnings +iecfpextension +separatesyb +usebytestrings,
-             any.libarchive ==3.0.2.1,
+             any.io-streams ==1.5.2.1,
+             io-streams +network -nointeractivetests +zlib,
+             any.language-c ==0.9.0.1,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libarchive ==3.0.2.2,
              libarchive -cross -low-memory -system-libarchive,
              any.libyaml ==0.1.2,
              libyaml -no-unicode -system-libyaml,
              any.lifted-base ==0.2.3.12,
-             any.list-t ==1.0.4,
-             any.lockfree-queue ==0.2.3.1,
-             lzma -static,
-             any.math-functions ==0.3.4.1,
-             math-functions +system-erf +system-expm1,
+             any.lzma-static ==5.2.5.4,
              any.megaparsec ==9.0.1,
              megaparsec -dev,
              any.microlens ==0.4.12.0,
              any.microlens-mtl ==0.2.0.1,
-             any.microlens-th ==0.4.3.9,
-             any.mmorph ==1.1.5,
+             any.microlens-th ==0.4.3.10,
              any.monad-control ==1.0.2.3,
              any.monad-logger ==0.3.36,
              monad-logger +template_haskell,
@@ -142,11 +144,12 @@ constraints: any.Cabal ==3.2.1.0,
              monad-loops +base4,
              any.mono-traversable ==1.0.15.1,
              any.mtl ==2.2.2,
-             any.mwc-random ==0.15.0.1,
-             any.network ==3.1.2.1,
+             any.network ==3.1.2.2,
              network -devel,
+             any.network-uri ==2.6.4.1,
              any.old-locale ==1.0.0.7,
              any.old-time ==1.1.0.3,
+             any.openssl-streams ==1.2.3.0,
              any.optics ==0.4,
              any.optics-core ==0.4,
              optics-core -explicit-generic-labels,
@@ -161,25 +164,25 @@ constraints: any.Cabal ==3.2.1.0,
              any.parsec ==3.1.14.0,
              any.parser-combinators ==1.3.0,
              parser-combinators -dev,
+             any.polyparse ==1.13,
              any.pretty ==1.1.3.6,
              any.pretty-terminal ==0.1.0.0,
              any.primitive ==0.7.1.0,
-             any.primitive-extras ==0.8.2,
-             any.primitive-unlifted ==0.1.3.0,
              any.process ==1.6.9.0,
              any.profunctors ==5.6.2,
              any.quickcheck-arbitrary-adt ==0.3.1.0,
              any.quickcheck-io ==0.2.0,
              any.random ==1.2.0,
-             any.recursion-schemes ==5.2.2,
+             any.recursion-schemes ==5.2.2.1,
              recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.1,
              any.regex-posix ==0.96.0.0,
              regex-posix -_regex-posix-clib,
              any.resourcet ==1.2.4.2,
-             any.rts ==1.0,
+             any.rts ==1.0.1,
              any.safe ==0.3.19,
-             any.safe-exceptions ==0.1.7.1,
-             any.scientific ==0.3.6.2,
+             any.safe-exceptions ==0.1.7.2,
+             any.scientific ==0.3.7.0,
              scientific -bytestring-builder -integer-simple,
              any.semigroupoids ==5.3.5,
              semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
@@ -188,36 +191,31 @@ constraints: any.Cabal ==3.2.1.0,
              any.split ==0.2.3.4,
              any.splitmix ==0.1.0.3,
              splitmix -optimised-mixer,
-             any.stm ==2.5.0.0,
+             any.stm ==2.5.0.1,
              any.stm-chans ==3.0.0.4,
              any.streaming-commons ==0.2.2.1,
              streaming-commons -use-bytestring-builder,
-             any.streamly ==0.7.3,
-             streamly -debug -dev -examples -examples-sdl -fusion-plugin -has-llvm -inspection -no-fusion -streamk,
-             any.streamly-bytestring ==0.1.2,
-             any.streamly-posix ==0.1.0.1,
              any.strict ==0.4.0.1,
              strict +assoc,
              any.strict-base ==0.4.0.0,
-             any.string-interpolate ==0.3.1.0,
+             any.string-interpolate ==0.3.1.1,
              string-interpolate -bytestring-builder -extended-benchmarks -text-builder,
              any.syb ==0.7.2.1,
              any.tagged ==0.8.6.1,
              tagged +deepseq +transformers,
-             any.tasty ==1.3.1,
-             tasty +clock,
-             any.tasty-hunit ==0.10.0.3,
-             any.tasty-quickcheck ==0.10.1.2,
+             any.tar ==0.6.0.0,
              any.template-haskell ==2.16.0.0,
+             any.temporary ==1.3,
+             any.terminal-progress-bar ==0.4.1,
              any.terminal-size ==0.3.2.1,
              any.terminfo ==0.4.1.4,
              any.text ==1.2.4.1,
              any.text-conversions ==0.3.1,
-             any.text-short ==0.1.3,
-             text-short -asserts,
+             any.text-zipper ==0.11,
              any.tf-random ==0.5,
              any.th-abstraction ==0.4.2.0,
-             any.th-compat ==0.1.1,
+             any.th-compat ==0.1.2,
+             any.th-expand-syns ==0.4.8.0,
              any.th-lift ==0.8.2,
              any.th-lift-instances ==0.1.18,
              any.th-orphans ==0.13.11,
@@ -225,7 +223,7 @@ constraints: any.Cabal ==3.2.1.0,
              any.these ==1.1.1.1,
              these +assoc,
              any.time ==1.9.3,
-             any.time-compat ==1.9.5,
+             any.time-compat ==1.9.6,
              time-compat -old-locale,
              any.transformers ==0.5.6.2,
              any.transformers-base ==0.4.5.2,
@@ -233,29 +231,34 @@ constraints: any.Cabal ==3.2.1.0,
              any.transformers-compat ==0.6.6,
              transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
              any.typed-process ==0.2.6.0,
-             any.unbounded-delays ==0.1.1.1,
              any.unix ==2.7.2.2,
              any.unix-bytestring ==0.3.7.3,
              any.unix-compat ==0.5.3,
              unix-compat -old-time,
              any.unix-time ==0.4.7,
              any.unliftio-core ==0.2.0.1,
-             any.unordered-containers ==0.2.13.0,
+             any.unordered-containers ==0.2.14.0,
              unordered-containers -debug,
-             any.uri-bytestring ==0.3.3.0,
+             any.uri-bytestring ==0.3.3.1,
              uri-bytestring -lib-werror,
              any.utf8-string ==1.0.2,
-             any.uuid-types ==1.0.4,
-             any.vector ==0.12.2.0,
+             any.uuid-types ==1.0.5,
+             any.vector ==0.12.3.0,
              vector +boundschecks -internalchecks -unsafechecks -wall,
              any.vector-algorithms ==0.8.0.4,
              vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
-             any.versions ==4.0.3,
+             any.versions ==5.0.0,
              any.vty ==5.33,
-             any.wcwidth ==0.0.2,
-             wcwidth -cli +split-base,
+             any.word-wrap ==0.4.1,
              any.word8 ==0.1.3,
+             any.xor ==0.0.1.0,
              any.yaml ==0.11.5.0,
              yaml +no-examples +no-exe,
-             zlib -non-blocking-ffi -pkg-config -static
-index-state: hackage.haskell.org 2021-03-07T18:36:25Z
+             any.zip ==1.7.1,
+             zip -dev -disable-bzip2 -disable-zstd,
+             any.zlib ==0.6.2.3,
+             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
+             any.zlib-bindings ==0.1.1.5,
+             any.zstd ==0.1.2.0,
+             zstd +standalone
+index-state: hackage.haskell.org 2021-07-12T18:00:24Z

cabal.ghc884.project

@@ -1,20 +0,0 @@
-packages: ./ghcup.cabal
-
-with-compiler: ghc-8.8.4
-
-optional-packages: ./3rdparty/*/*.cabal
-
-optimization: 2
-
-package streamly
-    ghc-options: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
-
-package ghcup
-    ghc-options: -O2 -fspec-constr-recursive=16 -fmax-worker-args=16
-
-constraints: http-io-streams -brotli
-
-package libarchive
-  flags: -system-libarchive
-
-allow-newer: base, ghc-prim, template-haskell

cabal.ghc901.project

@@ -0,0 +1,28 @@
+packages: ./ghcup.cabal
+
+optional-packages: ./vendored/*/*.cabal
+
+optimization: 2
+
+package ghcup
+    tests: True
+    flags: +tui
+
+source-repository-package
+    type: git
+    location: https://github.com/Bodigrim/tar
+    tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf
+
+source-repository-package
+    type: git
+    location: https://github.com/bgamari/terminal-size
+    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
+
+constraints: http-io-streams -brotli
+
+package libarchive
+  flags: -system-libarchive
+
+allow-newer: base, ghc-prim, template-haskell, language-c
+
+with-compiler: ghc-9.0.1

cabal.ghc901.project.freeze

@@ -1,12 +1,11 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.0.1.0,
+constraints: any.Cabal ==3.4.0.0,
              any.HUnit ==1.6.2.0,
-             any.IfElse ==0.85,
+             any.HsOpenSSL ==0.11.7,
+             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
              any.QuickCheck ==2.14.2,
              QuickCheck -old-random +templatehaskell,
              any.StateVar ==1.2.1,
-             any.abstract-deque ==0.3,
-             abstract-deque -usecas,
              any.aeson ==1.5.6.0,
              aeson -bytestring-builder -cffi -developer -fast,
              any.aeson-pretty ==0.8.8,
@@ -18,31 +17,32 @@ constraints: any.Cabal ==3.0.1.0,
              any.ansi-wl-pprint ==0.6.9,
              ansi-wl-pprint -example,
              any.array ==0.5.4.0,
-             any.ascii-string ==1.0.1.4,
              any.assoc ==1.0.2,
              any.async ==2.2.3,
              async -bench,
-             any.atomic-primops ==0.8.4,
-             atomic-primops -debug,
              any.attoparsec ==0.13.2.5,
              attoparsec -developer,
              any.auto-update ==0.1.6,
-             any.base ==4.13.0.0,
+             any.base ==4.15.0.0,
              any.base-compat ==0.11.2,
              any.base-compat-batteries ==0.11.2,
              any.base-orphans ==0.8.4,
              any.base16-bytestring ==1.0.1.0,
-             any.base64-bytestring ==1.2.0.1,
-             any.bifunctors ==5.5.10,
+             any.base64-bytestring ==1.1.0.0,
+             any.bifunctors ==5.5.11,
              bifunctors +semigroups +tagged,
-             any.binary ==0.8.7.0,
+             any.binary ==0.8.8.0,
+             any.bindings-DSL ==1.0.25,
              any.blaze-builder ==0.4.2.1,
-             any.bytestring ==0.10.10.1,
+             any.brick ==0.61,
+             brick -demos,
+             any.bytestring ==0.10.12.1,
              any.bz2 ==1.0.1.0,
              bz2 -cross +with-bzlib,
-             any.c2hs ==0.28.7,
+             any.bzlib-conduit ==0.3.0.2,
+             any.c2hs ==0.28.8,
              c2hs +base3 -regression,
-             any.call-stack ==0.3.0,
+             any.call-stack ==0.4.0,
              any.case-insensitive ==1.2.1.0,
              any.casing ==0.1.4.1,
              any.cereal ==0.5.8.1,
@@ -54,7 +54,7 @@ constraints: any.Cabal ==3.0.1.0,
              clock -llvm,
              any.cmdargs ==0.10.21,
              cmdargs +quotation -testprog,
-             any.colour ==2.3.5,
+             any.colour ==2.3.6,
              any.comonad ==5.0.8,
              comonad +containers +distributive +indexed-traversable,
              any.composition-prelude ==3.0.0.2,
@@ -62,16 +62,25 @@ constraints: any.Cabal ==3.0.1.0,
              any.concurrent-output ==1.10.12,
              any.conduit ==1.3.4.1,
              any.conduit-extra ==1.3.5,
-             any.containers ==0.6.2.1,
+             any.conduit-zstd ==0.0.2.0,
+             any.config-ini ==0.2.4.0,
+             config-ini -enable-doctests,
+             any.containers ==0.6.4.1,
              any.contravariant ==1.5.3,
              contravariant +semigroups +statevar +tagged,
+             any.cpphs ==1.20.9.1,
+             cpphs -old-locale,
+             any.cryptohash-sha1 ==0.11.100.1,
              any.cryptohash-sha256 ==0.11.102.0,
              cryptohash-sha256 -exe +use-cbits,
+             any.data-clist ==0.1.2.3,
              any.data-default-class ==0.1.2.0,
              any.data-fix ==0.3.1,
-             any.deepseq ==1.4.4.0,
-             any.deferred-folds ==0.9.17,
-             any.directory ==1.3.6.0,
+             any.deepseq ==1.4.5.0,
+             any.digest ==0.0.1.3,
+             digest -bytestring-in-base,
+             any.directory ==1.3.6.1,
+             any.disk-free-space ==0.1.0.1,
              any.distributive ==0.6.2.1,
              distributive +semigroups +tagged,
              any.dlist ==1.0,
@@ -79,63 +88,55 @@ constraints: any.Cabal ==3.0.1.0,
              any.easy-file ==0.2.2,
              any.errors ==2.3.0,
              any.exceptions ==0.10.4,
-             exceptions +transformers-0-4,
-             any.fast-logger ==3.0.3,
+             any.extra ==1.7.9,
+             any.fast-logger ==3.0.5,
              any.filepath ==1.4.2.1,
-             any.focus ==1.0.2,
-             any.foldl ==1.4.11,
-             any.free ==5.1.6,
-             any.fusion-plugin-types ==0.1.0,
+             any.free ==5.1.7,
              any.generic-arbitrary ==0.1.0,
              any.generics-sop ==0.5.1.1,
-             any.ghc-boot-th ==8.8.4,
-             any.ghc-prim ==0.5.3,
-             ghcup -internal-downloader -tar -tui,
+             any.ghc-bignum ==1.0,
+             any.ghc-boot-th ==9.0.1,
+             any.ghc-byteorder ==4.11.0.0.10,
+             any.ghc-prim ==0.7.0,
              any.happy ==1.20.0,
-             any.hashable ==1.3.1.0,
-             hashable +integer-gmp,
+             any.hashable ==1.3.2.0,
+             hashable +integer-gmp -random-initial-seed,
              any.haskell-src-exts ==1.23.1,
              any.haskell-src-meta ==0.8.7,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
              any.haskus-utils-variant ==3.1,
-             any.heaps ==0.3.6.1,
-             any.hpath ==0.11.0,
-             any.hpath-directory ==0.14.1,
              any.hpath-filepath ==0.10.4,
-             any.hpath-io ==0.14.1,
-             any.hpath-posix ==0.13.2,
+             any.hpath-posix ==0.13.3,
              any.hsc2hs ==0.68.7,
              hsc2hs -in-ghc-tree,
-             any.hspec ==2.7.8,
-             any.hspec-core ==2.7.8,
-             any.hspec-discover ==2.7.8,
+             any.hspec ==2.7.10,
+             any.hspec-core ==2.7.10,
+             any.hspec-discover ==2.7.10,
              any.hspec-expectations ==0.8.2,
-             any.hspec-golden-aeson ==0.7.0.0,
-             any.indexed-profunctors ==0.1,
+             any.hspec-golden-aeson ==0.9.0.0,
+             any.http-io-streams ==0.1.6.0,
+             http-io-streams -brotli +fast-xor,
+             any.indexed-profunctors ==0.1.1,
              any.indexed-traversable ==0.1.1,
              any.indexed-traversable-instances ==0.1,
-             any.integer-gmp ==1.0.2.0,
              any.integer-logarithms ==1.0.3.1,
              integer-logarithms -check-bounds +integer-gmp,
-             any.language-c ==0.8.3,
-             language-c -allwarnings +iecfpextension +separatesyb +usebytestrings,
-             any.libarchive ==3.0.2.1,
+             any.io-streams ==1.5.2.1,
+             io-streams +network -nointeractivetests +zlib,
+             any.language-c ==0.9.0.1,
+             language-c -allwarnings +iecfpextension +usebytestrings,
+             any.libarchive ==3.0.2.2,
              libarchive -cross -low-memory -system-libarchive,
              any.libyaml ==0.1.2,
              libyaml -no-unicode -system-libyaml,
              any.lifted-base ==0.2.3.12,
-             any.list-t ==1.0.4,
-             any.lockfree-queue ==0.2.3.1,
-             lzma -static,
-             any.math-functions ==0.3.4.1,
-             math-functions +system-erf +system-expm1,
+             any.lzma-static ==5.2.5.4,
              any.megaparsec ==9.0.1,
              megaparsec -dev,
              any.microlens ==0.4.12.0,
              any.microlens-mtl ==0.2.0.1,
-             any.microlens-th ==0.4.3.9,
-             any.mmorph ==1.1.5,
+             any.microlens-th ==0.4.3.10,
              any.monad-control ==1.0.2.3,
              any.monad-logger ==0.3.36,
              monad-logger +template_haskell,
@@ -143,11 +144,12 @@ constraints: any.Cabal ==3.0.1.0,
              monad-loops +base4,
              any.mono-traversable ==1.0.15.1,
              any.mtl ==2.2.2,
-             any.mwc-random ==0.15.0.1,
-             any.network ==3.1.2.1,
+             any.network ==3.1.2.2,
              network -devel,
+             any.network-uri ==2.6.4.1,
              any.old-locale ==1.0.0.7,
              any.old-time ==1.1.0.3,
+             any.openssl-streams ==1.2.3.0,
              any.optics ==0.4,
              any.optics-core ==0.4,
              optics-core -explicit-generic-labels,
@@ -162,25 +164,25 @@ constraints: any.Cabal ==3.0.1.0,
              any.parsec ==3.1.14.0,
              any.parser-combinators ==1.3.0,
              parser-combinators -dev,
+             any.polyparse ==1.13,
              any.pretty ==1.1.3.6,
              any.pretty-terminal ==0.1.0.0,
              any.primitive ==0.7.1.0,
-             any.primitive-extras ==0.8.2,
-             any.primitive-unlifted ==0.1.3.0,
-             any.process ==1.6.9.0,
+             any.process ==1.6.11.0,
              any.profunctors ==5.6.2,
              any.quickcheck-arbitrary-adt ==0.3.1.0,
              any.quickcheck-io ==0.2.0,
              any.random ==1.2.0,
-             any.recursion-schemes ==5.2.2,
+             any.recursion-schemes ==5.2.2.1,
              recursion-schemes +template-haskell,
+             any.regex-base ==0.94.0.1,
              any.regex-posix ==0.96.0.0,
              regex-posix -_regex-posix-clib,
              any.resourcet ==1.2.4.2,
              any.rts ==1.0,
              any.safe ==0.3.19,
-             any.safe-exceptions ==0.1.7.1,
-             any.scientific ==0.3.6.2,
+             any.safe-exceptions ==0.1.7.2,
+             any.scientific ==0.3.7.0,
              scientific -bytestring-builder -integer-simple,
              any.semigroupoids ==5.3.5,
              semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
@@ -193,32 +195,27 @@ constraints: any.Cabal ==3.0.1.0,
              any.stm-chans ==3.0.0.4,
              any.streaming-commons ==0.2.2.1,
              streaming-commons -use-bytestring-builder,
-             any.streamly ==0.7.3,
-             streamly -debug -dev -examples -examples-sdl -fusion-plugin -has-llvm -inspection -no-fusion -streamk,
-             any.streamly-bytestring ==0.1.2,
-             any.streamly-posix ==0.1.0.1,
              any.strict ==0.4.0.1,
              strict +assoc,
              any.strict-base ==0.4.0.0,
-             any.string-interpolate ==0.3.1.0,
+             any.string-interpolate ==0.3.1.1,
              string-interpolate -bytestring-builder -extended-benchmarks -text-builder,
              any.syb ==0.7.2.1,
              any.tagged ==0.8.6.1,
              tagged +deepseq +transformers,
-             any.tasty ==1.3.1,
-             tasty +clock,
-             any.tasty-hunit ==0.10.0.3,
-             any.tasty-quickcheck ==0.10.1.2,
-             any.template-haskell ==2.15.0.0,
+             any.tar ==0.6.0.0,
+             any.template-haskell ==2.17.0.0,
+             any.temporary ==1.3,
+             any.terminal-progress-bar ==0.4.1,
              any.terminal-size ==0.3.2.1,
              any.terminfo ==0.4.1.4,
-             any.text ==1.2.4.0,
+             any.text ==1.2.4.1,
              any.text-conversions ==0.3.1,
-             any.text-short ==0.1.3,
-             text-short -asserts,
+             any.text-zipper ==0.11,
              any.tf-random ==0.5,
              any.th-abstraction ==0.4.2.0,
-             any.th-compat ==0.1.1,
+             any.th-compat ==0.1.2,
+             any.th-expand-syns ==0.4.8.0,
              any.th-lift ==0.8.2,
              any.th-lift-instances ==0.1.18,
              any.th-orphans ==0.13.11,
@@ -226,7 +223,7 @@ constraints: any.Cabal ==3.0.1.0,
              any.these ==1.1.1.1,
              these +assoc,
              any.time ==1.9.3,
-             any.time-compat ==1.9.5,
+             any.time-compat ==1.9.6,
              time-compat -old-locale,
              any.transformers ==0.5.6.2,
              any.transformers-base ==0.4.5.2,
@@ -234,29 +231,34 @@ constraints: any.Cabal ==3.0.1.0,
              any.transformers-compat ==0.6.6,
              transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
              any.typed-process ==0.2.6.0,
-             any.unbounded-delays ==0.1.1.1,
              any.unix ==2.7.2.2,
              any.unix-bytestring ==0.3.7.3,
              any.unix-compat ==0.5.3,
              unix-compat -old-time,
              any.unix-time ==0.4.7,
              any.unliftio-core ==0.2.0.1,
-             any.unordered-containers ==0.2.13.0,
+             any.unordered-containers ==0.2.14.0,
              unordered-containers -debug,
-             any.uri-bytestring ==0.3.3.0,
+             any.uri-bytestring ==0.3.3.1,
              uri-bytestring -lib-werror,
              any.utf8-string ==1.0.2,
-             any.uuid-types ==1.0.4,
-             any.vector ==0.12.2.0,
+             any.uuid-types ==1.0.5,
+             any.vector ==0.12.3.0,
              vector +boundschecks -internalchecks -unsafechecks -wall,
              any.vector-algorithms ==0.8.0.4,
              vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
-             any.versions ==4.0.3,
+             any.versions ==5.0.0,
              any.vty ==5.33,
-             any.wcwidth ==0.0.2,
-             wcwidth -cli +split-base,
+             any.word-wrap ==0.4.1,
              any.word8 ==0.1.3,
+             any.xor ==0.0.1.0,
              any.yaml ==0.11.5.0,
              yaml +no-examples +no-exe,
-             zlib -non-blocking-ffi -pkg-config -static
-index-state: hackage.haskell.org 2021-03-07T18:36:25Z
+             any.zip ==1.7.1,
+             zip -dev -disable-bzip2 -disable-zstd,
+             any.zlib ==0.6.2.3,
+             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
+             any.zlib-bindings ==0.1.1.5,
+             any.zstd ==0.1.2.0,
+             zstd +standalone
+index-state: hackage.haskell.org 2021-07-12T18:00:24Z

ghcup-0.0.5.yaml

@@ -2060,8 +2060,8 @@ ghcupDownloads:
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.2/aarch64-linux-ghcup-0.1.15.2
-              dlHash: d91b7a5416f292f2cf813824eb419f76ad9976d258cee3581123cb6eb01db9a7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.2/aarch64-linux-ghcup-0.1.15.2-r1
+              dlHash: d853372440f3d43babbb868fad399811241760f2233829c92403fcbea8c547ec
           Darwin:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~ghcup/0.1.15.2/aarch64-apple-darwin-ghcup-0.1.15.2
@@ -2069,8 +2069,8 @@ ghcupDownloads:
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.2/armv7-linux-ghcup-0.1.15.2
-              dlHash: 03a4af5ed895ada1dd21f4cc3f64dc9078a5bf4268313021d004c04bea7f9c2e
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.2/armv7-linux-ghcup-0.1.15.2-r1
+              dlHash: f8add9b39e1f7d0f03904dc69a8683259972a4472432c1ade27d918c39a4a874
   HLS:
     1.1.0:
       viTags: []
@@ -2120,8 +2120,17 @@ ghcupDownloads:
         - old
       viChangeLog: https://github.com/commercialhaskell/stack/blob/master/ChangeLog.md#v251
       viPostInstall: &stack-post |
-        Stack manages GHC versions internally by default. In order to make it use ghcup installed GHC versions have a look at the options 'system-ghc', 'compiler-check' and 'compiler': https://docs.haskellstack.org/en/stable/yaml_configuration/#system-ghc
-        Additionally, you should upgrade stack only through ghcup.
+        Stack manages GHC versions internally by default. In order to make it use ghcup installed
+        GHC versions you can run the following commands:
+          stack config set install-ghc false --global
+          stack config set system-ghc  true  --global
+        
+        On windows, you may find the following config options useful too:
+          skip-msys, extra-path, extra-include-dirs, extra-lib-dirs
+
+        Also check out: https://docs.haskellstack.org/en/stable/yaml_configuration
+
+        !!! Additionally, you should upgrade stack only through ghcup and not use 'stack upgrade' !!!
       viArch:
         A_64:
           Linux_UnknownLinux:

lib/GHCup.hs

@@ -586,7 +586,7 @@ installStackBindist dlinfo ver = do
            , settings
            } <- lift ask
 
-  whenM (lift (hlsInstalled ver))
+  whenM (lift (stackInstalled ver))
     (throwE $ AlreadyInstalled Stack ver)
 
   -- download (or use cached version)
@@ -1880,3 +1880,49 @@ postGHCInstall ver@GHCTargetVersion {..} = do
     $ getMajorMinorV _tvVersion
   forM_ v' $ \(mj, mi) -> lift (getGHCForMajor mj mi _tvTarget)
     >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY)
+
+
+-- | Reports the binary location of a given tool:
+--
+--   * for GHC, this reports: @~\/.ghcup\/ghc\/\<ver\>\/bin\/ghc@
+--   * for cabal, this reports @~\/.ghcup\/bin\/cabal-\<ver\>@
+--   * for hls, this reports @~\/.ghcup\/bin\/haskell-language-server-wrapper-\<ver\>@
+--   * for stack, this reports @~\/.ghcup\/bin\/stack-\<ver\>@
+--   * for ghcup, this reports the location of the currently running executable
+whereIsTool :: ( MonadReader AppState m
+               , MonadLogger m
+               , MonadThrow m
+               , MonadFail m
+               , MonadIO m
+               , MonadCatch m
+               , MonadMask m
+               , MonadUnliftIO m
+               )
+            => Tool
+            -> GHCTargetVersion
+            -> Excepts '[NotInstalled] m FilePath
+whereIsTool tool ver@GHCTargetVersion {..} = do
+  AppState { dirs } <- lift ask
+
+  case tool of
+    GHC -> do
+      whenM (lift $ fmap not $ ghcInstalled ver)
+        $ throwE (NotInstalled GHC ver)
+      bdir <- lift $ ghcupGHCDir ver
+      pure (bdir </> "bin" </> "ghc" <> exeExt)
+    Cabal -> do
+      whenM (lift $ fmap not $ cabalInstalled _tvVersion)
+        $ throwE (NotInstalled Cabal (GHCTargetVersion Nothing _tvVersion))
+      pure (binDir dirs </> "cabal-" <> T.unpack (prettyVer _tvVersion) <> exeExt)
+    HLS -> do
+      whenM (lift $ fmap not $ hlsInstalled _tvVersion)
+        $ throwE (NotInstalled HLS (GHCTargetVersion Nothing _tvVersion))
+      pure (binDir dirs </> "haskell-language-server-wrapper-" <> T.unpack (prettyVer _tvVersion) <> exeExt)
+
+    Stack -> do
+      whenM (lift $ fmap not $ stackInstalled _tvVersion)
+        $ throwE (NotInstalled Stack (GHCTargetVersion Nothing _tvVersion))
+      pure (binDir dirs </> "stack-" <> T.unpack (prettyVer _tvVersion) <> exeExt)
+    GHCup -> do
+      currentRunningExecPath <- liftIO getExecutablePath
+      liftIO $ canonicalizePath currentRunningExecPath

lib/GHCup/Utils/Logger.hs

@@ -20,6 +20,7 @@ import           GHCup.Utils.String.QQ
 import           Control.Monad
 import           Control.Monad.IO.Class
 import           Control.Monad.Logger
+import           Data.Char               ( ord )
 import           Prelude                 hiding ( appendFile )
 import           System.Console.Pretty
 import           System.FilePath
@@ -43,20 +44,33 @@ myLoggerT LoggerConfig {..} loggingt = runLoggingT loggingt mylogger
   mylogger :: Loc -> LogSource -> LogLevel -> LogStr -> IO ()
   mylogger _ _ level str' = do
     -- color output
+    let style' = case level of
+          LevelDebug   -> style Bold . color Blue
+          LevelInfo    -> style Bold . color Green
+          LevelWarn    -> style Bold . color Yellow
+          LevelError   -> style Bold . color Red
+          LevelOther _ -> id
     let l = case level of
-          LevelDebug   -> toLogStr (style Bold $ color Blue "[ Debug ]")
-          LevelInfo    -> toLogStr (style Bold $ color Green "[ Info  ]")
-          LevelWarn    -> toLogStr (style Bold $ color Yellow "[ Warn  ]")
-          LevelError   -> toLogStr (style Bold $ color Red "[ Error ]")
+          LevelDebug   -> toLogStr (style' "[ Debug ]")
+          LevelInfo    -> toLogStr (style' "[ Info  ]")
+          LevelWarn    -> toLogStr (style' "[ Warn  ]")
+          LevelError   -> toLogStr (style' "[ Error ]")
           LevelOther t -> toLogStr "[ " <> toLogStr t <> toLogStr " ]"
-    let out = fromLogStr (l <> toLogStr " " <> str' <> toLogStr "\n")
+    let strs = fmap toLogStr . B.split (fromIntegral $ ord '\n') . fromLogStr $ str'
+    let out = case strs of
+                [] -> B.empty
+                (x:xs) -> fromLogStr
+                  . foldr (\a b -> a <> toLogStr "\n" <> b) mempty
+                  . ((l <> toLogStr " " <> x) :)
+                  . fmap (\line' -> toLogStr (style' "[ ...   ] ") <> line' )
+                  $ xs
 
     when (lcPrintDebug || (not lcPrintDebug && (level /= LevelDebug)))
       $ colorOutter out
 
     -- raw output
     let lr = case level of
-          LevelDebug   -> toLogStr "Debug: "
+          LevelDebug   -> toLogStr "Debug:"
           LevelInfo    -> toLogStr "Info:"
           LevelWarn    -> toLogStr "Warn:"
           LevelError   -> toLogStr "Error:"

refreeze.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -xue
+
+rm -f cabal.*.project
+rm -f cabal.*.project.freeze
+
+for ghc_ver in "$@" ; do
+	# shellcheck disable=SC3060
+	project_file=cabal.ghc${ghc_ver//./}.project
+
+	cp cabal.project "${project_file}"
+	case "$(uname -s)" in
+        MSYS*|MINGW*)
+			cabal freeze --project-file="${project_file}" -w "ghc-${ghc_ver}"
+			;;
+		*)
+			cabal freeze --project-file="${project_file}" -w "ghc-${ghc_ver}" -ftui -finternal-downloader
+			;;
+	esac
+
+
+	echo "" >> "${project_file}"
+	echo "with-compiler: ghc-${ghc_ver}" >> "${project_file}"
+
+	sed -i -e '/ghcup/d' "${project_file}".freeze
+done

www/ghcup.css

@@ -132,13 +132,17 @@ hr {
     margin-bottom: 2em;
 }
 
-#platform-instructions-linux > div > pre,
-#platform-instructions-mac > 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 {
+span.code {
+	font-family: 'Lucida Console', monospace;
+}
+
+#platform-instructions-linux div > pre,
+#platform-instructions-mac 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 $true</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 a non-interactive installation, change <span class='code'>$true</span> to <span class='code'>$false</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 $true</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'>$true</span> to <span class='code'>$false</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>
-		<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>
+		<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>