Enable libarchive wrt #147

Windows is an unknown platform in < 0.1.15

.gitlab-ci.yml

@@ -146,8 +146,24 @@ variables:
     - .test_ghcup_version
     - .darwin:aarch64
     - .root_cleanup
-  before_script:
+  script: |
-    - ./.gitlab/before_script/darwin/install_deps.sh
+    set -Eeuo pipefail
+    function runInNixShell() {
+      time nix-shell .gitlab/shell.nix \
+        -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \
+        --argstr system "x86_64-darwin" \
+        --pure \
+        --keep GHC_VERSION --keep CABAL_INSTALL_VERSION --keep BUILD_FLAVOUR \
+        --keep BIN_DIST_PREP_TAR_COMP --keep CPUS --keep PROJECT_DIR \
+        --keep CI_PROJECT_DIR --keep MAKE_ARGS --keep HADRIAN_ARGS --keep CABAL_CACHE \
+        --keep LANG --keep CONFIGURE_ARGS --keep TEST_ENV --keep BIN_DIST_NAME \
+        --keep MACOSX_DEPLOYMENT_TARGET --keep ac_cv_func_clock_gettime --keep HACKAGE_INDEX_STATE \
+        --keep CABAL_DIR --keep ARCH --keep OS --keep CABAL_VERSION --keep GHC_VERSION \ 
+        --keep JSON_VERSION --ARTIFACT \
+        --run "$1" 2>&1
+    }
+    runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1
+    runInNixShell ./.gitlab/script/ghcup_version.sh 2>&1
 
 .test_ghcup_version:freebsd:
   extends:
@@ -199,7 +215,7 @@ test:linux:bootstrap_script:
   script:
     - ./.gitlab/script/ghcup_bootstrap.sh
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
   extends:
     - .debian
@@ -211,7 +227,7 @@ test:linux:recommended:
   stage: test
   extends: .test_ghcup_version:linux
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
@@ -219,7 +235,7 @@ test:linux:latest:
   stage: test
   extends: .test_ghcup_version:linux
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "9.0.1"
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
@@ -229,7 +245,7 @@ test:linux:recommended:32bit:
   stage: test
   extends: .test_ghcup_version:linux32
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.2.0.0"
   needs: []
 
@@ -267,7 +283,7 @@ test:mac:latest:
   stage: test
   extends: .test_ghcup_version:darwin
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "9.0.1"
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
@@ -278,6 +294,7 @@ test:mac:recommended:aarch64:
     GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
   needs: []
+  allow_failure: true
 
 
 ######## freebsd test ########
@@ -292,23 +309,13 @@ test:freebsd:recommended:
   when: manual
   needs: []
 
-test:freebsd:latest:
-  stage: test
-  extends: .test_ghcup_version:freebsd
-  variables:
-    GHC_VERSION: "8.10.4"
-    CABAL_VERSION: "3.4.0.0"
-  allow_failure: true # freebsd runners are unreliable
-  when: manual
-  needs: []
-
 ######## windows test ########
 
 test:windows:recommended:
   stage: test
   extends: .test_ghcup_version:windows
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
@@ -324,7 +331,7 @@ release:linux:64bit:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
     ARTIFACT: "x86_64-linux-ghcup"
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
 
 
@@ -338,7 +345,7 @@ release:linux:32bit:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
     ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.2.0.0"
 
 release:linux:armv7:
@@ -380,26 +387,59 @@ release:darwin:
     - ./.gitlab/before_script/darwin/install_deps.sh
   variables:
     ARTIFACT: "x86_64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
     MACOSX_DEPLOYMENT_TARGET: "10.7"
 
+release:darwin:aarch64:
+  stage: release
+  needs: ["test:mac:recommended:aarch64"]
+  extends:
+    - .darwin:aarch64
+    - .release_ghcup
+    - .root_cleanup
+  before_script:
+    - ./.gitlab/before_script/darwin/install_deps.sh
+  variables:
+    ARTIFACT: "aarch64-apple-darwin-ghcup"
+    GHC_VERSION: "8.10.5"
+    CABAL_VERSION: "3.4.0.0"
+    MACOSX_DEPLOYMENT_TARGET: "10.7"
+  allow_failure: true
+
 
 ######## freebsd release ########
 
 release:freebsd:
   stage: release
-  needs: ["test:freebsd:recommended", "test:freebsd:latest"]
+  needs: ["test:freebsd:recommended"]
   extends:
     - .freebsd
     - .release_ghcup
     - .root_cleanup
-  before_script:
+  script: |
-    - ./.gitlab/before_script/freebsd/install_deps.sh
+    set -Eeuo pipefail
+    function runInNixShell() {
+      time nix-shell .gitlab/shell.nix \
+        -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \
+        --argstr system "x86_64-darwin" \
+        --pure \
+        --keep GHC_VERSION --keep CABAL_INSTALL_VERSION --keep BUILD_FLAVOUR \
+        --keep BIN_DIST_PREP_TAR_COMP --keep CPUS --keep PROJECT_DIR \
+        --keep CI_PROJECT_DIR --keep MAKE_ARGS --keep HADRIAN_ARGS --keep CABAL_CACHE \
+        --keep LANG --keep CONFIGURE_ARGS --keep TEST_ENV --keep BIN_DIST_NAME \
+        --keep MACOSX_DEPLOYMENT_TARGET --keep ac_cv_func_clock_gettime --keep HACKAGE_INDEX_STATE \
+        --keep CABAL_DIR --keep ARCH --keep OS --keep CABAL_VERSION --keep GHC_VERSION \ 
+        --keep JSON_VERSION --ARTIFACT \
+        --run "$1" 2>&1
+    }
+    runInNixShell ./.gitlab/before_script/freebsd/install_deps.sh 2>&1
+    runInNixShell ./.gitlab/script/ghcup_release.sh 2>&1
   variables:
     ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
+  allow_failure: true
 
 ######## windows release ########
 
@@ -414,7 +454,7 @@ release:windows:
     - bash ./.gitlab/before_script/windows/install_deps.sh
   variables:
     ARTIFACT: "x86_64-mingw64-ghcup"
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
 
 ######## hlint ########
@@ -428,7 +468,7 @@ hlint:
   script:
     - ./.gitlab/script/hlint.sh
   variables:
-    GHC_VERSION: "8.10.4"
+    GHC_VERSION: "8.10.5"
     CABAL_VERSION: "3.4.0.0"
     JSON_VERSION: "0.0.4"
   allow_failure: true

.gitlab/before_script/darwin/install_deps.sh

@@ -6,10 +6,15 @@ set -eux
 
 mkdir -p "${TMPDIR}"
 
-curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin
+if [ $ARCH = 'ARM64' ] ; then
-chmod +x ghcup-bin
+	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 > ./ghcup-bin
+	chmod +x ghcup-bin
+else
+	curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin
+	chmod +x ghcup-bin
+	./ghcup-bin upgrade -i -f
+fi
 
-./ghcup-bin upgrade -i -f
 ./ghcup-bin install ${GHC_VERSION}
 ./ghcup-bin set ${GHC_VERSION}
 ./ghcup-bin install-cabal ${CABAL_VERSION}

.gitlab/before_script/windows/install_deps.sh

@@ -6,11 +6,10 @@ set -eux
 
 mkdir -p "${TMPDIR}" "${CABAL_DIR}"
 
-rm -rf /c/ghcup
+mkdir -p "$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin"
-mkdir -p /c/ghcup
 
 CI_PROJECT_DIR=$(pwd)
-curl -o ghcup.exe https://downloads.haskell.org/~ghcup/tmp/x86_64-mingw64-ghcup-5.exe
+curl -o ghcup.exe https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-mingw64-ghcup-0.1.15.1.exe
 chmod +x ghcup.exe
 
 ./ghcup.exe install ${GHC_VERSION}

.gitlab/ghcup_env

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

.gitlab/script/ghcup_release.sh

@@ -37,12 +37,12 @@ else
 fi
 
 mkdir out
-cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" .
+binary=$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')
-ver=$(./ghcup --numeric-version)
+ver=$("${binary}" --numeric-version)
 if [ "${OS}" = "DARWIN" ] ; then
-	strip ./ghcup
+	strip "${binary}"
 else
-	strip -s ./ghcup
+	strip -s "${binary}"
 fi
-cp ghcup out/${ARTIFACT}-${ver}
+cp "${binary}" out/${ARTIFACT}-${ver}
 

.gitlab/script/ghcup_version.sh

@@ -60,16 +60,21 @@ else
 fi
 
 
-cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" .
+if [ "${OS}" = "WINDOWS" ] ; then
-cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" .
+	ext=".exe"
-
+else
-cp ./ghcup "$CI_PROJECT_DIR"/.local/bin/ghcup
+	ext=''
-cp ./ghcup-gen "$CI_PROJECT_DIR"/.local/bin/ghcup-gen
+fi
+	cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" "$CI_PROJECT_DIR"/.local/bin/ghcup${ext}
+	cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup-gen')" "$CI_PROJECT_DIR"/.local/bin/ghcup-gen${ext}
 
 ### cleanup
 
-rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
+if [ "${OS}" = "WINDOWS" ] ; then
-
+	rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/ghcup
+else
+	rm -rf "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
+fi
 
 ### manual cli based testing
 
@@ -92,9 +97,11 @@ eghcup list -t cabal
 
 ghc_ver=$(ghc --numeric-version)
 ghc --version
-ghci --version
+ghc-${ghc_ver} --version
-ghc-$(ghc --numeric-version) --version
+if [ "${OS}" != "WINDOWS" ] ; then
-ghci-$(ghc --numeric-version) --version
+		ghci --version
+		ghci-${ghc_ver} --version
+fi
 
 
 # test installing new ghc doesn't mess with currently set GHC

.gitlab/shell.nix

@@ -0,0 +1,91 @@
+{ system ? "aarch64-darwin"
+#, nixpkgs ? fetchTarball https://github.com/angerman/nixpkgs/archive/257cb120334.tar.gz #apple-silicon.tar.gz
+, pkgs ? import <nixpkgs> { inherit system; }
+, compiler ? if system == "aarch64-darwin" then "ghc8103Binary" else "ghc8103"
+}: pkgs.mkShell {
+  # this prevents nix from trying to write the env-vars file.
+  # we can't really, as NIX_BUILD_TOP/env-vars is not set.
+  noDumpEnvVars=1;
+
+  # stop polluting LDFLAGS with -liconv
+  dontAddExtraLibs = true;
+
+  # we need to inject ncurses into --with-curses-libraries.
+  # the real fix is to teach terminfo to use libcurses on macOS.
+  # CONFIGURE_ARGS = "--with-intree-gmp --with-curses-libraries=${pkgs.ncurses.out}/lib";
+  CONFIGURE_ARGS = "--with-intree-gmp --with-curses-libraries=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib --with-iconv-includes=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include --with-iconv-libraries=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib SH=/bin/bash";
+
+  # magic speedup pony :facepalm:
+  #
+  # nix has the ugly habbit of duplicating ld flags more than necessary.  This
+  # somewhat consolidates this.
+  shellHook = ''
+  export NIX_LDFLAGS=$(for a in $NIX_LDFLAGS; do echo $a; done |sort|uniq|xargs)
+  export NIX_LDFLAGS_FOR_TARGET=$(for a in $NIX_LDFLAGS_FOR_TARGET; do echo $a; done |sort|uniq|xargs)
+  export NIX_LDFLAGS_FOR_TARGET=$(comm -3 <(for l in $NIX_LDFLAGS_FOR_TARGET; do echo $l; done) <(for l in $NIX_LDFLAGS; do echo $l; done))
+
+
+  # Impurity hack for GHC releases.
+  #################################
+  # We don't want binary releases to depend on nix, thus we'll need to make sure we don't leak in references.
+  # GHC externally depends only on iconv and curses.  However we can't force a specific curses library for
+  # the terminfo package, as such we'll need to make sure we only look in the system path for the curses library
+  # and not pick up the tinfo from the nix provided ncurses package.
+  #
+  # We also need to force us to use the systems COREFOUNDATION, not the one that nix builds. Again this is impure,
+  # but it will allow us to have proper binary distributions.
+  #
+  # do not use nixpkgs provided core foundation
+  export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
+  # drop curses from the LDFLAGS, we really want the system ones, not the nix ones.
+  export NIX_LDFLAGS=$(for lib in $NIX_LDFLAGS; do case "$lib" in *curses*);; *) echo -n "$lib ";; esac; done;)
+  export NIX_CFLAGS_COMPILE+=" -Wno-nullability-completeness -Wno-availability -Wno-expansion-to-defined -Wno-builtin-requires-header -Wno-unused-command-line-argument"
+
+  # unconditionally add the MacOSX.sdk and TargetConditional.h
+  export NIX_CFLAGS_COMPILE+=" -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include"
+
+  # Use an architecture specific home, so cabal for different architectures don't confuse each other.
+  export HOME="$HOME/$(uname -m)-home"
+  mkdir -p $HOME
+  '';
+
+  nativeBuildInputs = (with pkgs; [
+    # This needs to come *before* ghc,
+    # otherwise we migth end up with the clang from
+    # the bootstrap GHC in PATH with higher priority.
+    clang_11
+    llvm_11
+
+    haskell.compiler.${compiler}
+    haskell.packages.${compiler}.cabal-install
+    haskell.packages.${compiler}.alex
+    haskell.packages.${compiler}.happy # _1_19_12 is needed for older GHCs.
+
+    automake
+    autoconf
+    m4
+
+    gmp
+    zlib.out
+    zlib.dev
+    glibcLocales
+    # locale doesn't build yet :-/
+    # locale
+
+    git
+
+    python3
+    # python3Full
+    # python3Packages.sphinx
+    perl
+
+    which
+    wget
+    file
+
+    xz
+    xlibs.lndir
+
+    cacert ])
+  ++ (with pkgs.darwin.apple_sdk.frameworks; [ Foundation Security ]);
+}

CHANGELOG.md

@@ -1,13 +1,14 @@
 # Revision history for ghcup
 
-## 0.1.15 -- ????-??-??
+## 0.1.15.1 -- 2021-06-11
 
+* Add Apple Silicon support
 * Add windows support wrt [#130](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/130)
-* Add date to GHC bindist names created by ghcup
+* Add stack support
 * Warn when /tmp doesn't have 5GB or more of disk space
 * Allow to compile GHC from git repo wrt [#126](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/126)
 * Allow to set custom ghc version when running 'ghcup compile ghc' wrt [#136](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/136)
-* Add stack support
+* Add date to GHC bindist names created by ghcup
 
 ## 0.1.14.2 -- 2021-05-12
 

README.md

@@ -123,6 +123,9 @@ Then you can control the locations via XDG environment variables as such:
 * `XDG_BIN_HOME`: binaries end up here (default: `~/.local/bin`)
 * `XDG_CONFIG_HOME`: the config file is stored in `ghcup` subdir as `config.yaml` (default: `~/.config`)
 
+**Note that `ghcup` makes some assumptions about structure of files in `XDG_BIN_HOME`. So if you have other tools
+installing e.g. stack/cabal/ghc into it, this will likely clash. In that case consider disabling XDG support.**
+
 ### Env variables
 
 This is the complete list of env variables that change GHCup behavior:
@@ -132,6 +135,7 @@ This is the complete list of env variables that change GHCup behavior:
 * `GHCUP_INSTALL_BASE_PREFIX`: the base of ghcup (default: `$HOME`)
 * `GHCUP_CURL_OPTS`: additional options that can be passed to curl
 * `GHCUP_WGET_OPTS`: additional options that can be passed to wget
+* `GHCUP_SKIP_UPDATE_CHECK`: Skip the (possibly annoying) update check when you run a command
 * `CC`/`LD` etc.: full environment is passed to the build system when compiling GHC via GHCup
 
 ### Installing custom bindists

app/ghcup/Main.hs

@@ -1095,10 +1095,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
     >>= \opt@Options {..} -> do
           dirs <- getDirs
 
-          (settings, keybindings) <- toSettings opt
-
           -- create ~/.ghcup dir
-          createDirRecursive' (baseDir dirs)
+          ensureDirectories dirs
+
+          (settings, keybindings) <- toSettings opt
 
           -- logger interpreter
           logfile <- initGHCupFileLogging (logsDir dirs)
@@ -1144,7 +1144,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
 
           case optCommand of
             Upgrade _ _ -> pure ()
-            _ -> runLogger $ flip runReaderT appstate $ checkForUpdates
+            _ -> do
+              lookupEnv "GHCUP_SKIP_UPDATE_CHECK" >>= \case
+                Nothing -> runLogger $ flip runReaderT appstate $ checkForUpdates
+                Just _ -> pure ()
 
 
           -- ensure global tools
@@ -1618,7 +1621,7 @@ Make sure to clean up #{tmpdir} afterwards.|])
               target <- case uOpts of
                 UpgradeInplace  -> Just <$> liftIO getExecutablePath
                 (UpgradeAt p)   -> pure $ Just p
-                UpgradeGHCupDir -> pure (Just (binDir </> "ghcup"))
+                UpgradeGHCupDir -> pure (Just (binDir </> "ghcup" <> exeExt))
 
               runUpgrade (liftE $ upgradeGHCup target force) >>= \case
                 VRight v' -> do

bootstrap-haskell

@@ -16,14 +16,14 @@
 
 plat="$(uname -s)"
 arch=$(uname -m)
-ghver="0.1.14.1"
+ghver="0.1.15.1"
 base_url="https://downloads.haskell.org/~ghcup"
 
 case "${plat}" in
         MSYS*|MINGW*)
 			: "${GHCUP_INSTALL_BASE_PREFIX:=/c}"
-			GHCUP_DIR=${GHCUP_INSTALL_BASE_PREFIX}/ghcup
+			GHCUP_DIR=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup")
-			GHCUP_BIN=${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin
+			GHCUP_BIN=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin")
 			: "${GHCUP_MSYS2:=${GHCUP_DIR}/msys64}"
 			;;
 		*)
@@ -73,9 +73,9 @@ _eghcup() {
 		args="-s ${BOOTSTRAP_HASKELL_YAML}"
 	fi 
     if [ -z "${BOOTSTRAP_HASKELL_VERBOSE}" ] ; then
-        ghcup ${args} "$@"
+        "${GHCUP_BIN}/ghcup" ${args} "$@"
     else
-        ghcup ${args} --verbose "$@"
+        "${GHCUP_BIN}/ghcup" ${args} --verbose "$@"
     fi
 }
 
@@ -166,6 +166,10 @@ download_ghcup() {
         "Darwin"|"darwin")
 			case "${arch}" in
 				x86_64|amd64)
+					_url=${base_url}/${ghver}/x86_64-apple-darwin-ghcup-${ghver}
+					;;
+				aarch64|arm64|armv8l)
+					_url=${base_url}/${ghver}/aarch64-apple-darwin-ghcup-${ghver}
 					;;
 				i*86)
 					die "i386 currently not supported!"
@@ -173,11 +177,11 @@ download_ghcup() {
 				*) die "Unknown architecture: ${arch}"
 					;;
 			esac
-			_url=${base_url}/${ghver}/x86_64-apple-darwin-ghcup-${ghver} ;;
+			;;
         MSYS*|MINGW*)
 			case "${arch}" in
 				x86_64|amd64)
-					_url=https://downloads.haskell.org/ghcup/0.1.15-rc2/x86_64-mingw64-ghcup-0.1.15.exe
+					_url=${base_url}/${ghver}/x86_64-mingw64-ghcup-${ghver}.exe
 					;;
 				*) die "Unknown architecture: ${arch}"
 					;;
@@ -273,7 +277,7 @@ 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
+	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
@@ -327,7 +331,7 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 
 		case $hls_answer in
 			[Yy]*)
-				eghcup --cache install hls
+				eghcup --cache install hls || warn "HLS installation failed, continuing anyway"
 				break ;;
 			[Nn]* | "")
 				break ;;
@@ -354,7 +358,7 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 
 		case $stack_answer in
 			[Yy]*)
-				eghcup --cache install stack
+				eghcup --cache install stack || warn "Stack installation failed, continuing anyway"
 				break ;;
 			[Nn]* | "")
 				break ;;
@@ -415,17 +419,13 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 				case $MY_SHELL in
 					"") break ;;
 					fish)
-						if ! grep -q "ghcup-env" "${GHCUP_PROFILE_FILE}" ; then
 							mkdir -p "${GHCUP_PROFILE_FILE%/*}"
-							echo "# ghcup-env" >> "${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" >> "${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}"
-							echo "test -f $GHCUP_DIR/env ; and set -gx PATH \$HOME/.cabal/bin $GHCUP_BIN \$PATH" >> "${GHCUP_PROFILE_FILE}"
-						fi
 						break ;;
 					bash)
-						if ! grep -q "ghcup-env" "${GHCUP_PROFILE_FILE}" ; then
+						sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
-							echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+						echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
-						fi
 						case "${plat}" in
 							"Darwin"|"darwin")
 								if ! grep -q "ghcup-env" "${HOME}/.bash_profile" ; then
@@ -436,9 +436,8 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 						break ;;
 
 					zsh)
-						if ! grep -q "ghcup-env" "${GHCUP_PROFILE_FILE}" ; then
+						sed -i -e '/# ghcup-env$/ s/^#*/#/' "${GHCUP_PROFILE_FILE}"
-							echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
+						echo "[ -f \"${GHCUP_DIR}/env\" ] && source \"${GHCUP_DIR}/env\" # ghcup-env" >> "${GHCUP_PROFILE_FILE}"
-						fi
 						break ;;
 				esac
                 warn "OK! ${GHCUP_PROFILE_FILE} has been modified. Restart your terminal for the changes to take effect,"

bootstrap-haskell.ps1

@@ -1,3 +1,32 @@
+<#
+    .SYNOPSIS
+    Script to bootstrap a Haskell environment
+
+    .DESCRIPTION
+    This is the windows GHCup installer, installing:
+
+    * ghcup - The Haskell toolchain installer"
+    * ghc   - The Glasgow Haskell Compiler"
+    * msys2 - Unix-style toolchain needed for dependencies and tools
+    * cabal - The Cabal build tool for managing Haskell software"
+    * stack - (optional) A cross-platform program for developing Haskell projects"
+    * hls   - (optional) A language server for developers to integrate with their editor/IDE"
+#>
+param (
+    # Run a non-interactive installation
+    [switch]$Silent,
+    # Specify the install root (default: 'C:\')
+    [string]$InstallDir,
+    # Instead of installing a new MSys2, use an existing installation
+    [string]$ExistingMsys2Dir,
+    # Specify the cabal root directory (default: '$InstallDir\cabal')
+    [string]$CabalDir,
+    # Perform a quick installation, omitting some expensive operations (you may have to install dependencies yourself later)
+    [bool]$Quick,
+    # Overwrite (or rather backup) a previous install
+    [bool]$Overwrite
+)
+
 function Print-Msg {
   param ( [Parameter(Mandatory=$true, HelpMessage='String to output')][string]$msg, [string]$color = "Green" )
   Write-Host ('{0}' -f $msg) -ForegroundColor $color
@@ -15,51 +44,48 @@ function Create-Shortcut {
 }
 
 function Add-EnvPath {
-    param(
+  param(
-        [Parameter(Mandatory=$true,HelpMessage='The Pathe to add to Users environment')]
+      [Parameter(Mandatory=$true,HelpMessage='The Path to add to Users environment')]
-        [string] $Path,
+      [string] $Path,
 
-        [ValidateSet('Machine', 'User', 'Session')]
+      [ValidateSet('Machine', 'User', 'Session')]
-        [string] $Container = 'Session'
+      [string] $Container = 'Session'
-    )
+  )
 
-    function Where-Something
+  if ($Container -eq 'Session') {
-    {
+      $envPaths = [Collections.Generic.List[String]]($env:Path -split ([IO.Path]::PathSeparator))
-      param
+      if ($envPaths -notcontains $Path) {
-      (
+          $envPaths.Add($Path)
-        [Parameter(Mandatory=$true, ValueFromPipeline=$true, HelpMessage='Data to filter')]
+          $env:PATH = $envPaths -join ([IO.Path]::PathSeparator)
-        $InputObject
+      }
-      )
+  }
-      process
+  else {
-      {
+      [Microsoft.Win32.RegistryHive]$hive, $keyPath = switch ($Container) {
-        if ($InputObject)
+          'Machine' { 'LocalMachine', 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment' }
-        {
+          'User' { 'CurrentUser', 'Environment' }
-          $InputObject
-        }
       }
-    }
 
-  if ($Container -ne 'Session') {
+      $hiveKey = $envKey = $null
-        $containerMapping = @{
+      try {
-            Machine = [EnvironmentVariableTarget]::Machine
+          $hiveKey = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey($hive, '')
-            User = [EnvironmentVariableTarget]::User
+          $envKey = $hiveKey.OpenSubKey($keyPath, $true)
-        }
+          $rawPath = $envKey.GetValue('PATH', '', 'DoNotExpandEnvironmentNames')
-        $containerType = $containerMapping[$Container]
 
-        $persistedPaths = [Environment]::GetEnvironmentVariable('Path', $containerType) -split ';'
+          $envPaths = [Collections.Generic.List[String]]($rawPath -split ([IO.Path]::PathSeparator))
-        if ($persistedPaths -notcontains $Path) {
+          if ($envPaths -notcontains $Path) {
-            $persistedPaths = $persistedPaths + $Path | Where-Something
+              $envPaths.Add($Path)
-            [Environment]::SetEnvironmentVariable('Path', $persistedPaths -join ';', $containerType)
+              $envKey.SetValue('PATH', ($envPaths -join ([IO.Path]::PathSeparator)), 'ExpandString')
-        }
+          }
-    }
+      }
-
+      finally {
-    $envPaths = $env:Path -split ';'
+          if ($envKey) { $envKey.Close() }
-    if ($envPaths -notcontains $Path) {
+          if ($hiveKey) { $hiveKey.Close() }
-        $envPaths = $envPaths + $Path | Where-Something
+      }
-        $env:Path = $envPaths -join ';'
+  }
-    }
 }
 
+
+
 filter Get-FileSize {
 	'{0:N2} {1}' -f $(
 	if ($_ -lt 1kb) { $_, 'Bytes' }
@@ -91,22 +117,102 @@ function Get-FileWCSynchronous{
     Get-Item -Path $destination | Unblock-File
 }
 
+function Test-AbsolutePath {
+  Param (
+      [Parameter(Mandatory=$True)]
+      [ValidateScript({[System.IO.Path]::IsPathRooted($_)})]
+      [String]$Path
+  )
+}
+
+function Exec
+{
+    [CmdletBinding()]
+    param(
+        [Parameter(Position = 0, Mandatory = 1)][string]$cmd,
+        [Parameter()][string]$errorMessage,
+        [parameter(ValueFromRemainingArguments = $true)]
+        [string[]]$Passthrough
+    )
+    & $cmd @Passthrough
+    if ($lastexitcode -ne 0) {
+        if (!($errorMessage)) {
+          throw ('Exec: Error executing command {0} with arguments ''{1}''' -f $cmd, "$Passthrough")
+        } else {
+          throw ('Exec: ' + $errorMessage)
+        }
+    }
+}
+
 $ErrorActionPreference = 'Stop'
 
-$GhcupDir = "C:\ghcup"
+$GhcupBasePrefixEnv = [System.Environment]::GetEnvironmentVariable('GHCUP_INSTALL_BASE_PREFIX', 'user')
+
+if ($GhcupBasePrefixEnv) {
+  $defaultGhcupBasePrefix = $GhcupBasePrefixEnv
+} else {
+  $defaultGhcupBasePrefix = 'C:\'
+}
+
+if ($Silent -and !($InstallDir)) {
+  $GhcupBasePrefix = $defaultGhcupBasePrefix
+} elseif ($InstallDir) {
+  if (!(Test-Path -LiteralPath ('{0}' -f $InstallDir) -IsValid)) {
+    Print-Msg -color Red -msg "Not a valid directory!"
+    Exit 1
+  } elseif (!(Split-Path -IsAbsolute -Path "$InstallDir")) {
+    Print-Msg -color Red -msg "Non-absolute Path specified!"
+    Exit 1
+  } else {
+    $GhcupBasePrefix = $InstallDir
+  }
+} else {
+  while ($true) {
+    Print-Msg -color Magenta -msg ('Where to install to (this should be a short Path, preferably a Drive like ''C:\''){1}Press enter to accept the default [{0}]:' -f $defaultGhcupBasePrefix, "`n")
+    $basePrefixPrompt = Read-Host
+    $GhcupBasePrefix = ($defaultGhcupBasePrefix,$basePrefixPrompt)[[bool]$basePrefixPrompt]
+    if (!($GhcupBasePrefix.EndsWith('\'))) {
+      $GhcupBasePrefix = ('{0}\' -f $GhcupBasePrefix)
+    }
+  
+    if (!($GhcupBasePrefix)) {
+      Print-Msg -color Red -msg "No directory specified!"
+    } elseif (!(Test-Path -LiteralPath ('{0}' -f $GhcupBasePrefix))) {
+      Print-Msg -color Red -msg "Directory does not exist, need to specify an existing Drive/Directory"
+    } elseif (!(Split-Path -IsAbsolute -Path "$GhcupBasePrefix")) {
+      Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
+    } else {
+      Break
+    }
+  }
+}
+
+Print-Msg -msg ('Setting env variable GHCUP_INSTALL_BASE_PREFIX to ''{0}''' -f $GhcupBasePrefix)
+$null = [Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $GhcupBasePrefix, [System.EnvironmentVariableTarget]::User)
+
+
+$GhcupDir = ('{0}\ghcup' -f $GhcupBasePrefix)
 $MsysDir = ('{0}\msys64' -f $GhcupDir)
 $Bash = ('{0}\usr\bin\bash' -f $MsysDir)
-$BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell-windows'
+$BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell'
 $GhcupMsys2 = [System.Environment]::GetEnvironmentVariable('GHCUP_MSYS2', 'user')
 
 Print-Msg -msg 'Preparing for GHCup installation...'
 
-if (Test-Path -Path ('{0}' -f $GhcupDir)) {
+if (Test-Path -LiteralPath ('{0}' -f $GhcupDir)) {
-  $decision = $Host.UI.PromptForChoice('Install GHCup'
+  Print-Msg -msg ('GHCup already installed at ''{0}''...' -f $GhcupDir)
-                                      , 'GHCup is already installed, what do you want to do?'
+  if ($Overwrite) {
-                                      , @('&Reinstall'
+    $decision = 0
-                                          '&Continue'
+  } elseif (!($Silent)) {
-                                          '&Abort'), 1)
+    $decision = $Host.UI.PromptForChoice('Install GHCup'
+                                        , 'GHCup is already installed, what do you want to do?'
+                                        , [System.Management.Automation.Host.ChoiceDescription[]] @('&Reinstall'
+                                            '&Continue'
+                                            '&Abort'), 1)
+  } else {
+    $decision = 1
+  }
+
   if ($decision -eq 0) {
     $suffix = [IO.Path]::GetRandomFileName()
     Print-Msg -msg ('Backing up {0} to {0}-{1} ...' -f $GhcupDir, $suffix)
@@ -114,7 +220,7 @@ if (Test-Path -Path ('{0}' -f $GhcupDir)) {
   } elseif ($decision -eq 1) {
     Print-Msg -msg 'Continuing installation...'
   } elseif ($decision -eq 2) {
-    Break
+    Exit 0
   }
 }
 
@@ -124,11 +230,16 @@ $null = New-Item -Path ('{0}' -f $GhcupDir) -Name 'bin' -ItemType 'directory' -E
 
 Print-Msg -msg 'First checking for Msys2...'
 
-if (!(Test-Path -Path ('{0}' -f $MsysDir)) -And !($GhcupMsys2)) {
+if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
-  $msys2Decision = $Host.UI.PromptForChoice('Install MSys2'
+  if ($Silent) {
-                                           , 'Do you want GHCup to install a default MSys2 toolchain (recommended)?'
+    $msys2Decision = 0
-                                           , @('&Yes'
+  } else {
-                                               '&No'), 0)
+    $msys2Decision = $Host.UI.PromptForChoice('Install MSys2'
+        , 'Do you want GHCup to install a default MSys2 toolchain (recommended)?'
+        , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
+            '&No'), 0)
+  }
+
   if ($msys2Decision -eq 0) {
     Print-Msg -msg ('...Msys2 doesn''t exist, installing into {0} ...this may take a while' -f $MsysDir)
 
@@ -137,7 +248,7 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir)) -And !($GhcupMsys2)) {
     $archive = 'msys2-x86_64-latest.sfx.exe'
     
     if (Get-Command -Name 'curl.exe' -ErrorAction SilentlyContinue) {
-      curl.exe -o ('{0}\{1}' -f $env:TEMP, $archive) ('https://repo.msys2.org/distrib/{0}' -f $archive)
+      Exec "curl.exe" '-o' ('{0}\{1}' -f $env:TEMP, $archive) ('https://repo.msys2.org/distrib/{0}' -f $archive)
     } else {
       Get-FileWCSynchronous -url ('https://repo.msys2.org/distrib/{0}' -f $archive) -destinationFolder "$env:TEMP" -includeStats
     }
@@ -147,50 +258,62 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir)) -And !($GhcupMsys2)) {
     Remove-Item -Path ('{0}/{1}' -f $env:TEMP, $archive)
 
     Print-Msg -msg 'Processing MSYS2 bash for first time use...'
-    & "$Bash" -lc 'exit'
+    Exec "$Bash" '-lc' 'exit'
 
-    & "$env:windir\system32\taskkill.exe" /F /FI `"MODULES eq msys-2.0.dll`"
+    Exec "$env:windir\system32\taskkill.exe" /F /FI `"MODULES eq msys-2.0.dll`"
 
     Print-Msg -msg 'Upgrading full system...'
-    & "$Bash" -lc 'pacman --noconfirm -Syuu'
+    Exec "$Bash" '-lc' 'pacman --noconfirm -Syuu'
 
     Print-Msg -msg 'Upgrading full system twice...'
-    & "$Bash" -lc 'pacman --noconfirm -Syuu'
+    Exec "$Bash" '-lc' 'pacman --noconfirm -Syuu'
 
-    Print-Msg -msg 'Installing GHC Build Dependencies...'
+    if ($Quick) {
-    & "$Bash" -lc 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake python p7zip patch unzip mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb mingw-w64-x86_64-python2 mingw-w64-x86_64-python3-sphinx'
+      $ghcBuildDeps = $Quick
+    } elseif (!($Silent)) {
+      $ghcBuildDeps = $Host.UI.PromptForChoice('Install Dependencies'
+        , 'Install a standard set of mingw64 packages to be able to build various haskell packages requiring unix libraries? (recommended, however this might take a while... if you skip this, you might have to do it manually later)'
+        , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
+            '&No'), 0)
+    } else {
+      $ghcBuildDeps = 0
+    }
+    if ($ghcBuildDeps -eq 0) {
+      Print-Msg -msg 'Installing Dependencies...'
+      Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake pkgconf python p7zip patch unzip'
+    }
 
     Print-Msg -msg 'Updating SSL root certificate authorities...'
-    & "$Bash" -lc 'pacman --noconfirm -S ca-certificates'
+    Exec "$Bash" '-lc' 'pacman --noconfirm -S ca-certificates'
 
     Print-Msg -msg 'Setting default home directory...'
-    & "$Bash" -lc "sed -i -e 's/db_home:.*$/db_home: windows/' /etc/nsswitch.conf"
+    Exec "$Bash" '-lc' "sed -i -e 's/db_home:.*$/db_home: windows/' /etc/nsswitch.conf"
   } elseif ($msys2Decision -eq 1) {
-    Print-Msg -color Magenta -msg 'Skipping MSys2 installation.'
+    Print-Msg -color Yellow -msg 'Skipping MSys2 installation.'
-    if ($GhcupMsys2) {
+    while ($true) {
-      Print-Msg -msg 'GHCUP_MSYS2 env var set, using existing installation...'
+      if ($GhcupMsys2) {
-      $MsysDir = $GhcupMsys2
+        $defaultMsys2Dir = $GhcupMsys2
-    } else {
+        Print-Msg -color Magenta -msg ('Input existing MSys2 toolchain directory. Press enter to accept the default [{0}]:' -f $defaultMsys2Dir)
-      $MsysDir = Read-Host -Prompt 'Input existing MSys2 toolchain directory'
+        $MsysDirPrompt = Read-Host
+        $MsysDir = ($defaultMsys2Dir,$MsysDirPrompt)[[bool]$MsysDirPrompt]
+      } else {
+        Print-Msg -color Magenta -msg 'Input existing MSys2 toolchain directory:' 
+        $MsysDir = Read-Host
+      }
+      if (!($MsysDir)) {
+        Print-Msg -color Red -msg "No directory specified!"         
+      } elseif (!(Test-Path -LiteralPath ('{0}' -f $MsysDir))) {
+        Print-Msg -color Red -msg ('MSys2 installation at ''{0}'' could not be found!' -f $MsysDir)
+      } elseif (!(Split-Path -IsAbsolute -Path "$MsysDir")) {
+        Print-Msg -color Red -msg "Invalid/Non-absolute Path specified"
+      } else {
+        Break
+      }
     }
-
+    Print-Msg -msg ('Setting GHCUP_MSYS2 env var to ''{0}''' -f $MsysDir)
-    if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
-      Print-Msg -color Red -msg ('MSys2 installation at ''{0}'' could not be found, aborting!' -f $MsysDir)
-      Break
-    }
-    Print-Msg -msg 'Making MSys2 discoverable for GHCup...'
     $null = [Environment]::SetEnvironmentVariable("GHCUP_MSYS2", $MsysDir, [System.EnvironmentVariableTarget]::User)
     $Bash = ('{0}\usr\bin\bash' -f $MsysDir)
   }
-} elseif ($GhcupMsys2) {
-  if (!(Test-Path -Path ('{0}' -f $GhcupMsys2))) {
-    Print-Msg -color Red -msg ('MSys2 installation at ''{0}'' could not be found, aborting!' -f $GhcupMsys2)
-    Break
-  }
-  $MsysDir = $GhcupMsys2
-  Print-Msg -msg 'Making MSys2 discoverable for GHCup...'
-  $null = [Environment]::SetEnvironmentVariable("GHCUP_MSYS2", $MsysDir, [System.EnvironmentVariableTarget]::User)
-  $Bash = ('{0}\usr\bin\bash' -f $MsysDir)
 } else {
     Print-Msg -msg ('...Msys2 found in {0} ...skipping Msys2 installation.' -f $MsysDir)
 }
@@ -200,16 +323,55 @@ Create-Shortcut -SourceExe ('{0}\msys2_shell.cmd' -f $MsysDir) -ArgumentsToSourc
 Create-Shortcut -SourceExe 'https://www.msys2.org/docs/package-management' -ArgumentsToSourceExe '' -DestinationPath ('{0}\Desktop\Mingw package management docs.url' -f $HOME)
 
 Print-Msg -msg ('Adding {0}\bin to Users Path...' -f $GhcupDir)
-Add-EnvPath -Path ('{0}\bin' -f $GhcupDir) -Container 'User'
+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)
+$null = [Environment]::SetEnvironmentVariable("CABAL_DIR", $CabalDirFull, [System.EnvironmentVariableTarget]::User)
 
 Print-Msg -msg 'Starting GHCup installer...'
 
 $Msys2Shell = ('{0}\msys2_shell.cmd' -f $MsysDir)
 
-if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) {
+if ($Silent) {
-  & "$Bash" -lc ('[ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -w ''{1}'') ; export PATH="/c/ghcup/bin:$PATH" ; curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash' -f $BootstrapUrl, $MsysDir)
+  $SilentExport = 'export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 ;'
 } else {
-  & "$Msys2Shell" -mingw64 -mintty -c ('[ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -w ''{1}'') ; export PATH="/c/ghcup/bin:$PATH" ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; curl --proto =https --tlsv1.2 -sSf -k {0} | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir)
+  $SilentExport = ''
+}
+
+if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) {
+  Exec "$Bash" '-lc' ('{4} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; curl --proto ''=https'' --tlsv1.2 -sSf {0} | bash' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
+} else {
+  Exec "$Msys2Shell" '-mingw64' '-mintty' '-c' ('{4} [ -n ''{1}'' ] && export GHCUP_MSYS2=$(cygpath -m ''{1}'') ; [ -n ''{2}'' ] && export GHCUP_INSTALL_BASE_PREFIX=$(cygpath -m ''{2}/'') ; export PATH=$(cygpath -u ''{3}/bin''):$PATH ; export CABAL_DIR=''{5}'' ; trap ''echo Press any key to exit && read -n 1 && exit'' 2 ; curl --proto =https --tlsv1.2 -sSf -k {0} | bash ; echo ''Press any key to exit'' && read -n 1' -f $BootstrapUrl, $MsysDir, $GhcupBasePrefix, $GhcupDir, $SilentExport, $CabalDirFull)
 }
 
 
@@ -236,3 +398,4 @@ if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) {
   # aED5Ujwyq3Qre+TGVRUqwkEauDhQiX2A008G00fRO6+di6yJRCRn5eaRAbdU3Xww
   # E5VhEwLBnwzWrvLKtdEclhgUCo5Tq87QMXVdgX4aRmunl4ZE+Q==
 # SIG # End signature block
+

cabal.project

@@ -11,6 +11,11 @@ source-repository-package
     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

ghcup-0.0.4.yaml

@@ -1520,11 +1520,11 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-apple-darwin.tar.xz
               dlSubdir: ghc-8.10.5
               dlHash: ef0f47eff8962d58fa447123636cf8ef31c1e5b2d0ae90177d3388861ddf4a22
-          # FreeBSD:
+          FreeBSD:
-          #   unknown_versioning:
+            unknown_versioning:
-          #     dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz
-          #     dlSubdir: ghc-8.10.5
+              dlSubdir: ghc-8.10.5
-          #     dlHash: c9776a2ccf9629b03e967206a507fcdcb6c5189800a626e9461ababf6733c357
+              dlHash: 11a0b490bfb2f57b5bc87c69c197542eafce1b4991cc22f625179a6c6e567834
         A_32:
           Linux_Debian:
             '( >= 9 && < 10 )': &ghc-8105-32-deb9
@@ -1868,7 +1868,7 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
               dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
   GHCup:
-    0.1.14.1:
+    0.1.15.1:
       viTags:
       - Recommended
       - Latest
@@ -1878,35 +1878,39 @@ ghcupDownloads:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-linux-ghcup-0.1.15.1
-              dlHash: 59e31b2ede3ed20f79dce0f8ba0a68b6fb25e5f00ba2d7243f6a8af68d979ff5
+              dlHash: 871c9dc1bfbf7df6fe3b9b7250c20a3dae8a7aee171712a3e63689ab75bc9439
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-apple-darwin-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-apple-darwin-ghcup-0.1.15.1
-              dlHash: 3e1dd173b3e7b5d90dcdece423c3ddd3efb4c83e964967b0fb574c9b7b2c44e1
+              dlHash: 7cd67b554fc58c4ffb224b73e369c5dd27c5276c01f102f6423230b34cc635bc
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-portbld-freebsd-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-portbld-freebsd-ghcup-0.1.15.1
-              dlHash: 89a70980d77888dae8b9fd0f05e7a7920f421bc3bb5192da8e73fd4e7b4cb86f
+              dlHash: b4ad9c9f1a878560e8f770d985d53b8fb70582baf99e40e53ec9ee97dc47ae64
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/i386-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/i386-linux-ghcup-0.1.15.1
-              dlHash: 610aac7c3be3ba3874c07b9cae5b2ca0da9a92bf381afc2597bd2dc9c70aae0c
+              dlHash: 0c1dcbdd7cfa8accdfbe14c623924f3ca29a35d32a2ac3e61f0eb322855e2cb1
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/aarch64-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-linux-ghcup-0.1.15.1
-              dlHash: e9ae07b7d41ea03e6af9c1f3587f61287827c4e29478b6a5d46ea1ce5af4cee5
+              dlHash: 7fa29d8e9a9fe3d1e3a63a1d16fc3550128edbdb9b5b5dff7974358c4dab192c
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1
+              dlHash: 6a743cd50e8124ac2de8be77013d49dcf3b99ce7cc463ec86ed99a904a51dfd9
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/armv7-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/armv7-linux-ghcup-0.1.15.1
-              dlHash: 646832030efbc0a848df24c08b5eb7507bd15d1c2eb95fea6d9d03890f3662be
+              dlHash: 77ee5d9828c2ba771127274e301e81412b9f29af2d65dd85dada4786d9438c2c
   HLS:
     1.1.0:
       viTags:

ghcup-0.0.5.yaml

@@ -1631,11 +1631,11 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-apple-darwin.tar.xz
               dlSubdir: ghc-8.10.5
               dlHash: ef0f47eff8962d58fa447123636cf8ef31c1e5b2d0ae90177d3388861ddf4a22
-          # FreeBSD:
+          FreeBSD:
-          #   unknown_versioning:
+            unknown_versioning:
-          #     dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz
-          #     dlSubdir: ghc-8.10.5
+              dlSubdir: ghc-8.10.5
-          #     dlHash: c9776a2ccf9629b03e967206a507fcdcb6c5189800a626e9461ababf6733c357
+              dlHash: 11a0b490bfb2f57b5bc87c69c197542eafce1b4991cc22f625179a6c6e567834
           Windows:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-unknown-mingw32.tar.xz
@@ -1665,6 +1665,11 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-aarch64-deb10-linux.tar.xz
               dlSubdir: ghc-8.10.5
               dlHash: 9a085cd8a7f8e0ace21ac67dbf659a56fcf41564b48817ba42cd8a1aac7f0ddc
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-aarch64-apple-darwin.tar.xz
+              dlSubdir: ghc-8.10.5
+              dlHash: 03684e70ff03d041b9a4e0f84c177953a241ab8ec7a028c72fa21ac67e66cb09
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
@@ -2008,13 +2013,18 @@ ghcupDownloads:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-aarch64-ubuntu-18.04.tar.xz
               dlHash: 04d378347896dfdc3510b192b97489815cfa5d692f46e2758da0f789e682b8f0
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-aarch64-darwin-big-sur.tar.xz
+              dlHash: 46d8f96446a6bcdb81b3a9fbc14b137dc4f08436b46fe6446c5fba7bcb9b3d75
+
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
               dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
   GHCup:
-    0.1.14.1:
+    0.1.15.1:
       viTags:
       - Recommended
       - Latest
@@ -2024,39 +2034,43 @@ ghcupDownloads:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-linux-ghcup-0.1.15.1
-              dlHash: 59e31b2ede3ed20f79dce0f8ba0a68b6fb25e5f00ba2d7243f6a8af68d979ff5
+              dlHash: 871c9dc1bfbf7df6fe3b9b7250c20a3dae8a7aee171712a3e63689ab75bc9439
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-apple-darwin-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-apple-darwin-ghcup-0.1.15.1
-              dlHash: 3e1dd173b3e7b5d90dcdece423c3ddd3efb4c83e964967b0fb574c9b7b2c44e1
+              dlHash: 7cd67b554fc58c4ffb224b73e369c5dd27c5276c01f102f6423230b34cc635bc
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-portbld-freebsd-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-portbld-freebsd-ghcup-0.1.15.1
-              dlHash: 89a70980d77888dae8b9fd0f05e7a7920f421bc3bb5192da8e73fd4e7b4cb86f
+              dlHash: b4ad9c9f1a878560e8f770d985d53b8fb70582baf99e40e53ec9ee97dc47ae64
           Windows:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/tmp/x86_64-mingw64-ghcup-1.exe
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-mingw64-ghcup-0.1.15.1.exe
-              dlHash: a61ae29e677db0f0a93505e0ab3b35b7ccc3ebec6a2a2cf9418cfd550ef82ec6
+              dlHash: 045bac4620fc9d1119ed4961aeba46b616ed572dd11b7d35b48caf58eea08d0f
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/i386-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/i386-linux-ghcup-0.1.15.1
-              dlHash: 610aac7c3be3ba3874c07b9cae5b2ca0da9a92bf381afc2597bd2dc9c70aae0c
+              dlHash: 0c1dcbdd7cfa8accdfbe14c623924f3ca29a35d32a2ac3e61f0eb322855e2cb1
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/aarch64-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-linux-ghcup-0.1.15.1
-              dlHash: e9ae07b7d41ea03e6af9c1f3587f61287827c4e29478b6a5d46ea1ce5af4cee5
+              dlHash: 7fa29d8e9a9fe3d1e3a63a1d16fc3550128edbdb9b5b5dff7974358c4dab192c
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1
+              dlHash: 6a743cd50e8124ac2de8be77013d49dcf3b99ce7cc463ec86ed99a904a51dfd9
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/armv7-linux-ghcup-0.1.14.1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/armv7-linux-ghcup-0.1.15.1
-              dlHash: 646832030efbc0a848df24c08b5eb7507bd15d1c2eb95fea6d9d03890f3662be
+              dlHash: 77ee5d9828c2ba771127274e301e81412b9f29af2d65dd85dada4786d9438c2c
   HLS:
     1.1.0:
       viTags:
@@ -2082,9 +2096,12 @@ ghcupDownloads:
             unknown_versioning: *hls-64
   Stack:
     2.5.1:
-      viTags: []
+      viTags:
+        - 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"
+      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.
       viArch:
         A_64:
           Linux_UnknownLinux:

ghcup.cabal

@@ -1,6 +1,6 @@
 cabal-version:   3.0
 name:            ghcup
-version:         0.1.15
+version:         0.1.15.1
 license:         LGPL-3.0-only
 license-file:    LICENSE
 copyright:       Julian Ospald 2020
@@ -115,7 +115,7 @@ library
     , generics-sop          ^>=0.5
     , haskus-utils-types    ^>=1.5
     , haskus-utils-variant  >=3.0        && <3.2
-    , lzma-static           ^>=5.2.5.2
+    , lzma-static           ^>=5.2.5.3
     , megaparsec            >=8.0.0      && <9.1
     , monad-logger          ^>=0.3.31
     , mtl                   ^>=2.2
@@ -157,7 +157,7 @@ library
       , io-streams             >=1.5.2.1
       , terminal-progress-bar  >=0.4.1
 
-  if (flag(tar) || os(windows))
+  if flag(tar)
     cpp-options:   -DTAR
     build-depends: tar
 
@@ -243,7 +243,7 @@ executable ghcup
   if os(windows)
     cpp-options: -DIS_WINDOWS
 
-  if (flag(tar) || os(windows))
+  if flag(tar)
     cpp-options: -DTAR
 
   else
@@ -297,7 +297,7 @@ executable ghcup-gen
     , versions              ^>=4.0.1
     , yaml                  ^>=0.11.4.0
 
-  if (flag(tar) || os(windows))
+  if flag(tar)
     cpp-options:   -DTAR
     build-depends: tar
 

lib/GHCup.hs

@@ -84,6 +84,9 @@ import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Map.Strict               as Map
 import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as E
+#if defined(IS_WINDOWS)
+import qualified System.Win32.File             as Win32
+#endif
 import qualified Text.Megaparsec               as MP
 import GHCup.Utils.MegaParsec
 import Control.Concurrent (threadDelay)
@@ -658,7 +661,6 @@ setGHC ver sghc = do
 
   -- symlink destination
   AppState { dirs = Dirs {..} } <- lift ask
-  liftIO $ createDirRecursive' binDir
 
   -- first delete the old symlinks (this fixes compatibility issues
   -- with old ghcup)
@@ -741,7 +743,6 @@ setCabal ver = do
 
   -- symlink destination
   AppState {dirs = Dirs {..}} <- lift ask
-  liftIO $ createDirRecursive' binDir
 
   whenM (liftIO $ not <$> doesFileExist (binDir </> targetFile))
     $ throwE
@@ -772,7 +773,6 @@ setHLS :: ( MonadCatch m
        -> Excepts '[NotInstalled] m ()
 setHLS ver = do
   AppState { dirs = Dirs {..} } <- lift ask
-  liftIO $ createDirRecursive' binDir
 
   -- Delete old symlinks, since these might have different ghc versions than the
   -- selected version, so we could end up with stray or incorrect symlinks.
@@ -815,7 +815,6 @@ setStack ver = do
 
   -- symlink destination
   AppState {dirs = Dirs {..}} <- lift ask
-  liftIO $ createDirRecursive' binDir
 
   whenM (liftIO $ not <$> doesFileExist (binDir </> targetFile))
     $ throwE
@@ -878,7 +877,7 @@ listVersions :: ( MonadCatch m
 listVersions lt' criteria = do
   -- some annoying work to avoid too much repeated IO
   cSet <- cabalSet
-  cabals <- getInstalledCabals' cSet
+  cabals <- getInstalledCabals
   hlsSet' <- hlsSet
   hlses <- getInstalledHLSs
   sSet <- stackSet
@@ -1400,7 +1399,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs
 
           lEM $ git [ "checkout", "FETCH_HEAD" ]
           lEM $ git [ "submodule", "update", "--init", "--depth", "1" ]
-          lEM $ execLogged "sh" ["./boot"] (Just tmpUnpack) "ghc-bootstrap" Nothing
+          lEM $ execLogged "python3" ["./boot"] (Just tmpUnpack) "ghc-bootstrap" Nothing
           lEM $ execLogged "sh" ["./configure"] (Just tmpUnpack) "ghc-bootstrap" Nothing
           CapturedProcess {..} <- lift $ makeOut
             ["show!", "--quiet", "VALUE=ProjectVersion" ] (Just tmpUnpack)
@@ -1637,14 +1636,27 @@ upgradeGHCup mtarget force = do
   let fn = "ghcup" <> exeExt
   p <- liftE $ download settings dli tmp (Just fn)
   let destDir = takeDirectory destFile
-      destFile = fromMaybe (binDir </> fn) mtarget
+      destFile = fromMaybe (binDir </> fn <> exeExt) mtarget
   lift $ $(logDebug) [i|mkdir -p #{destDir}|]
   liftIO $ createDirRecursive' destDir
+#if defined(IS_WINDOWS)
+  let tempGhcup = cacheDir </> "ghcup.old"
+  liftIO $ hideError NoSuchThing $ rmFile tempGhcup
+
+  lift $ $(logDebug) [i|mv #{destFile} #{tempGhcup}|]
+  -- NoSuchThing may be raised when we're updating ghcup from
+  -- a non-standard location
+  liftIO $ hideError NoSuchThing $ Win32.moveFileEx destFile (Just tempGhcup) 0
+  lift $ $(logDebug) [i|cp #{p} #{destFile}|]
+  handleIO (throwE . CopyError . show) $ liftIO $ copyFile p
+                                                           destFile
+#else
   lift $ $(logDebug) [i|rm -f #{destFile}|]
   liftIO $ hideError NoSuchThing $ rmFile destFile
   lift $ $(logDebug) [i|cp #{p} #{destFile}|]
   handleIO (throwE . CopyError . show) $ liftIO $ copyFile p
                                                            destFile
+#endif
   lift $ chmod_755 destFile
 
   liftIO (isInPath destFile) >>= \b -> unless b $

lib/GHCup/Download.hs

@@ -227,7 +227,6 @@ getBase dirs@Dirs{..} Settings{ downloader }  =
           else -- access in less than 5 minutes, re-use file
                liftIO $ L.readFile json_file
       else do
-        liftIO $ createDirRecursive' cacheDir
         getModTime >>= \case
           Just modTime -> dlWithMod modTime json_file
           Nothing -> do

lib/GHCup/Platform.hs

@@ -98,7 +98,6 @@ getPlatform = do
         either (const Nothing) Just
           . versioning
           -- TODO: maybe do this somewhere else
-          . getMajorVersion
           . decUTF8Safe'
         <$> getDarwinVersion
       pure $ PlatformResult { _platform = Darwin, _distroVersion = ver }
@@ -112,7 +111,6 @@ getPlatform = do
   lift $ $(logDebug) [i|Identified Platform as: #{prettyShow pfr}|]
   pure pfr
  where
-  getMajorVersion = T.intercalate "." . take 2 . T.split (== '.')
   getFreeBSDVersion = lift $ fmap _stdOut $ executeOut "freebsd-version" [] Nothing
   getDarwinVersion = lift $ fmap _stdOut $ executeOut "sw_vers"
                                                         ["-productVersion"]

lib/GHCup/Utils.hs

@@ -87,7 +87,6 @@ import qualified Codec.Archive.Tar             as Tar
 import qualified Codec.Compression.BZip        as BZip
 import qualified Codec.Compression.GZip        as GZip
 import qualified Codec.Compression.Lzma        as Lzma
-import qualified Data.ByteString               as B
 import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Map.Strict               as Map
 import qualified Data.Text                     as T
@@ -253,14 +252,6 @@ getInstalledGHCs = do
 getInstalledCabals :: (MonadLogger m, MonadReader AppState m, MonadIO m, MonadCatch m)
                    => m [Either FilePath Version]
 getInstalledCabals = do
-  cs <- cabalSet -- for legacy cabal
-  getInstalledCabals' cs
-
-
-getInstalledCabals' :: (MonadLogger m, MonadReader AppState m, MonadIO m, MonadCatch m)
-                   => Maybe Version
-                   -> m [Either FilePath Version]
-getInstalledCabals' cs = do
   AppState {dirs = Dirs {..}} <- ask
   bins   <- liftIO $ handleIO (\_ -> pure []) $ findFiles
     binDir
@@ -269,7 +260,7 @@ getInstalledCabals' cs = do
     Just (Right r) -> pure $ Right r
     Just (Left  _) -> pure $ Left f
     Nothing        -> pure $ Left f
-  pure $ maybe vs (\x -> nub $ Right x:vs) cs
+  pure $ nub vs
 
 
 -- | Whether the given cabal version is installed.
@@ -284,32 +275,21 @@ cabalSet :: (MonadLogger m, MonadReader AppState m, MonadIO m, MonadThrow m, Mon
 cabalSet = do
   AppState {dirs = Dirs {..}} <- ask
   let cabalbin = binDir </> "cabal" <> exeExt
-  b        <- handleIO (\_ -> pure False) $ liftIO $ pathIsLink cabalbin
+
-  if
+  handleIO' NoSuchThing (\_ -> pure Nothing) $ do
-    | b -> do
+    broken <- liftIO $ isBrokenSymlink cabalbin
-      handleIO' NoSuchThing (\_ -> pure Nothing) $ do
+    if broken
-        broken <- liftIO $ isBrokenSymlink cabalbin
+      then pure Nothing
-        if broken
+      else do
-          then pure Nothing
+        link <- liftIO
-          else do
+          $ handleIO' InvalidArgument
-            link <- liftIO $ getLinkTarget cabalbin
+            (\e -> pure $ Left (toException e))
-            case linkVersion link of
+          $ fmap Right $ getLinkTarget cabalbin
-              Right v -> pure $ Just v
+        case linkVersion =<< link of
-              Left err -> do
+          Right v -> pure $ Just v
-                $(logWarn) [i|Failed to parse cabal symlink target with: "#{err}". The symlink #{cabalbin} needs to point to valid cabal binary, such as 'cabal-3.4.0.0'.|]
+          Left err -> do
-                pure Nothing
+            $(logWarn) [i|Failed to parse cabal symlink target with: "#{err}". The symlink #{cabalbin} needs to point to valid cabal binary, such as 'cabal-3.4.0.0'.|]
-    | otherwise -> do -- legacy behavior
+            pure Nothing
-      mc <- handleIO (\_ -> pure Nothing) $ fmap Just $ executeOut
-        cabalbin
-        ["--numeric-version"]
-        Nothing
-      fmap join $ forM mc $ \c -> if
-        | not (BL.null (_stdOut c)), _exitCode c == ExitSuccess -> do
-          let reportedVer = fst . B.spanEnd isNewLine . BL.toStrict . _stdOut $ c
-          case version $ decUTF8Safe reportedVer of
-            Left  e -> throwM e
-            Right r -> pure $ Just r
-        | otherwise -> pure Nothing
  where
   -- We try to be extra permissive with link destination parsing,
   -- because of:
@@ -375,18 +355,25 @@ getInstalledStacks = do
 
 -- Return the currently set stack version, if any.
 -- TODO: there's a lot of code duplication here :>
-stackSet :: (MonadReader AppState m, MonadIO m, MonadThrow m, MonadCatch m) => m (Maybe Version)
+stackSet :: (MonadReader AppState m, MonadIO m, MonadThrow m, MonadCatch m, MonadLogger m) => m (Maybe Version)
 stackSet = do
   AppState {dirs = Dirs {..}} <- ask
   let stackBin = binDir </> "stack" <> exeExt
 
-  liftIO $ handleIO' NoSuchThing (\_ -> pure Nothing) $ do
+  handleIO' NoSuchThing (\_ -> pure Nothing) $ do
-    broken <- isBrokenSymlink stackBin
+    broken <- liftIO $ isBrokenSymlink stackBin
     if broken
       then pure Nothing
       else do
-        link <- liftIO $ getLinkTarget stackBin
+        link <- liftIO
-        Just <$> linkVersion link
+          $ handleIO' InvalidArgument
+            (\e -> pure $ Left (toException e))
+          $ fmap Right $ getLinkTarget stackBin
+        case linkVersion =<< link of
+          Right v -> pure $ Just v
+          Left err -> do
+            $(logWarn) [i|Failed to parse stack symlink target with: "#{err}". The symlink #{stackBin} needs to point to valid stack binary, such as 'stack-2.7.1'.|]
+            pure Nothing
  where
   linkVersion :: MonadThrow m => FilePath -> m Version
   linkVersion = throwEither . MP.parse parser "" . T.pack . dropSuffix exeExt
@@ -1088,3 +1075,21 @@ ensureGlobalTools = do
 #else
   pure ()
 #endif
+
+
+-- | Ensure ghcup directory structure exists.
+ensureDirectories :: Dirs -> IO ()
+ensureDirectories dirs = do
+  let Dirs
+        { baseDir
+        , binDir
+        , cacheDir
+        , logsDir
+        , confDir
+        } = dirs
+  createDirRecursive' baseDir
+  createDirRecursive' binDir
+  createDirRecursive' cacheDir
+  createDirRecursive' logsDir
+  createDirRecursive' confDir
+  pure ()

lib/GHCup/Utils/Dirs.hs

@@ -47,14 +47,12 @@ import           Data.Maybe
 import           Data.String.Interpolate
 import           GHC.IO.Exception               ( IOErrorType(NoSuchThing) )
 import           Haskus.Utils.Variant.Excepts
-#if !defined(IS_WINDOWS)
 import           Optics
+#if !defined(IS_WINDOWS)
 import           System.Directory                                                
 #endif
 import           System.DiskSpace                                                
-#if !defined(IS_WINDOWS)
 import           System.Environment
-#endif
 import           System.FilePath
 import           System.IO.Temp
 
@@ -78,7 +76,8 @@ import Control.Concurrent (threadDelay)
 ghcupBaseDir :: IO FilePath
 ghcupBaseDir = do
 #if defined(IS_WINDOWS)
-  pure ("C:\\" </> "ghcup")
+  bdir <- fromMaybe "C:\\" <$> lookupEnv "GHCUP_INSTALL_BASE_PREFIX"
+  pure (bdir </> "ghcup")
 #else
   xdg <- useXDG
   if xdg
@@ -104,7 +103,7 @@ ghcupBaseDir = do
 ghcupConfigDir :: IO FilePath
 ghcupConfigDir = do
 #if defined(IS_WINDOWS)
-  pure ("C:\\" </> "ghcup")
+  ghcupBaseDir
 #else
   xdg <- useXDG
   if xdg
@@ -129,7 +128,7 @@ ghcupConfigDir = do
 ghcupBinDir :: IO FilePath
 ghcupBinDir = do
 #if defined(IS_WINDOWS)
-  pure ("C:\\" </> "ghcup" </> "bin")
+  ghcupBaseDir <&> (</> "bin")
 #else
   xdg <- useXDG
   if xdg
@@ -150,7 +149,7 @@ ghcupBinDir = do
 ghcupCacheDir :: IO FilePath
 ghcupCacheDir = do
 #if defined(IS_WINDOWS)
-  pure ("C:\\" </> "ghcup" </> "cache")
+  ghcupBaseDir <&> (</> "cache")
 #else
   xdg <- useXDG
   if xdg
@@ -172,7 +171,7 @@ ghcupCacheDir = do
 ghcupLogsDir :: IO FilePath
 ghcupLogsDir = do
 #if defined(IS_WINDOWS)
-  pure ("C:\\" </> "ghcup" </> "logs")
+  ghcupBaseDir <&> (</> "logs")
 #else
   xdg <- useXDG
   if xdg

lib/GHCup/Utils/Logger.hs

@@ -22,7 +22,6 @@ import           Control.Monad.IO.Class
 import           Control.Monad.Logger
 import           Prelude                 hiding ( appendFile )
 import           System.Console.Pretty
-import           System.Directory        hiding ( findFiles )
 import           System.FilePath
 import           System.IO.Error
 import           Text.Regex.Posix
@@ -70,7 +69,6 @@ initGHCupFileLogging :: (MonadIO m) => FilePath -> m FilePath
 initGHCupFileLogging logsDir = do
   let logfile = logsDir </> "ghcup.log"
   liftIO $ do
-    createDirectoryIfMissing True logsDir
     logFiles <- findFiles
       logsDir
       (makeRegexOpts compExtended

stack.yaml

@@ -27,8 +27,8 @@ extra-deps:
   - hspec-core-2.7.10@sha256:2aba6ea126442b29e8183ab27f1c811706b19b1d83b02f193a896f6fc1589d13,4621
   - hspec-discover-2.7.10@sha256:d08bf5dd785629f589571477d9beb7cd91529471bd89f39517c1cb4b9b38160f,2184
   - hspec-golden-aeson-0.9.0.0@sha256:aa17274114026661ba4dfc9c60c230673c8f408bd86482fd611d2d5cb6aff996,2179
-  - lzma-static-5.2.5.2@sha256:ac38dcad9ab423342a72ba48415bd75f62234e9c9e11831495b75603b5a060f6,7184
   - libarchive-3.0.2.1@sha256:40ebf2a278e585802427bc58826867208bb33822f63d56107a1fcc3ca04d691d,10990
+  - lzma-static-5.2.5.3@sha256:2758ee58c35992fcf7db78e98684c357a16a82fa2a4e7c352a6c210c08c555d8,7308
   - os-release-1.0.1@sha256:1281c62081f438fc3f0874d3bae6a4887d5964ac25261ba06e29d368ab173467,2716
   - primitive-0.7.0.1@sha256:a381571c36edc7dca28b77fe8159b43c14c640087ec5946adacf949feec64231,3433
   - regex-posix-clib-2.7

www/ghcup.js

@@ -158,8 +158,8 @@ function copyToClipboard() {
   document.body.removeChild(el);
 }
 
-function copyToClipboardSilicon() {
+function copyToClipboardPowershell() {
-  const text = document.getElementById("ghcup-command-silicon").innerText;
+  const text = document.getElementById("ghcup-command-powershell").innerText;
   const el = document.createElement('textarea');
   el.value = text;
   document.body.appendChild(el);

www/index.html

@@ -14,13 +14,12 @@
 
   <body id="idx">
 
-    <script id='html-content' type="text/html">
       <a id="platform-button" style="display: none;" href="#">
         click or press "n" to cycle platforms
       </a>
 
       <p id="pitch">
-        <em>ghcup</em> is the main installer for<br/>
+        <em>ghcup</em> is an installer for<br/>
         the general purpose language <a href="https://www.haskell.org/">Haskell</a>
       </p>
 
@@ -32,10 +31,7 @@
 
       <div id="platform-instructions-mac" class="instructions" style="display: none;">
         <p>Run the following in your terminal (as a user other than root), then follow the onscreen instructions.</p>
-		<p>On Intel:</p>
 		<div class="command-button"><pre><span class='ghcup-command' id="ghcup-command-normal">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>On Apple Silicon:</p>
-		<div class="command-button"><pre><span class='ghcup-command' id="ghcup-command-silicon">curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | arch -x86_64 /bin/bash</span></pre><button class="tooltip" onclick="copyToClipboardSilicon()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
         <p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup-hs#manual-install">other installation methods</a>.<br/>You appear to be running macOS. If not, <a class="default-platform-button" href="#">display all supported installers</a>.</p>
       </div>
 
@@ -47,8 +43,8 @@
 
       <div id="platform-instructions-win32" class="instructions">
         <p>
-          To install Haskell, follow the instructions on
+            To install Haskell,<br/>run the following in a powershell session (as a non-admin user).
-          <a class="windows-download" href="https://www.haskell.org/platform/#windows">Haskell Platform</a>
+			<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>
 		<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>
@@ -58,8 +54,8 @@
 
       <div id="platform-instructions-win64" class="instructions" style="display: none;">
         <p>
-          To install Haskell, follow the instructions on
+            To install Haskell,<br/>run the following in a powershell session (as a non-admin user).
-          <a class="windows-download" href="https://www.haskell.org/platform/#windows">Haskell Platform</a>
+			<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>
         </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>
@@ -95,8 +91,8 @@
 
         <div>
           <p>
-            If you are running Windows,<br/>follow the instructions on
+            If you are running Windows,<br/>run the following in a powershell session (as a non-admin user).
-            <a class="windows-download" href="https://www.haskell.org/platform/#windows">Haskell Platform</a>
+			<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>
           </p>
         </div>
 
@@ -104,11 +100,9 @@
 
       <div id="platform-instructions-default" class="instructions">
         <div>
-          <p>To install Haskell, if you are running Linux, macOS (on Intel), FreeBSD or Windows Subsystem 2 for Linux, run the following
+          <p>To install Haskell, if you are running Linux, macOS, FreeBSD or Windows Subsystem 2 for Linux, run the following
           in your terminal (as a user other than root), then follow the onscreen instructions.</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>For macOS on Apple Silicon, run this instead:</p>
-          <div class="command-button"><pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | arch -x86_64 /bin/bash</span></pre><button class="tooltip" onclick="copyToClipboardSilicon()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
           <p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup-hs#manual-install">other installation methods</a>.</p>
         </div>
 
@@ -116,8 +110,8 @@
 
         <div>
           <p>
-            If you are running Windows,<br/>follow the instructions on
+            If you are running Windows,<br/>run the following in a powershell session (as a non-admin user).
-            <a class="windows-download" href="https://www.haskell.org/platform/#windows">Haskell Platform</a>
+			<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>
           </p>
         </div>
 
@@ -137,54 +131,7 @@
         &nbsp;&middot;&nbsp;
         <a href="https://github.com/rust-lang/rustup.rs/tree/master/www">web design from rustup</a>
       </p>
-    </script>
-    <script>
-      document.write(document.getElementById("html-content").innerHTML);
-    </script>
     <script type="text/javascript" src="ghcup.js"></script>
 
-    <noscript>
-      <p id="pitch">
-        <em>ghcup</em> is the main installer for<br/>
-        the general purpose language <a href="https://www.haskell.org/">Haskell</a>
-      </p>
-
-      <div id="platform-instructions-default" class="instructions">
-        <div>
-          <p>To install Haskell, if you are running Linux, macOS (on Intel), FreeBSD or Windows Subsystem for Linux 2, run the following
-          in your terminal (as a user other than root), then follow the onscreen instructions.</p>
-		  <pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh</span></pre>
-          <p>For macOS on Apple Silicon, run this instead:</p>
-          <div class="command-button"><pre><span class='ghcup-command'>curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | arch -x86_64 /bin/bash</span></pre><button class="tooltip" onclick="copyToClipboardSilicon()"><img src="copy.svg" alt="" /><span class="tooltiptext">Copy to clipboard</span></button></div>
-          <p class="other-help">If you don't like curl | sh, see <a href="https://gitlab.haskell.org/haskell/ghcup-hs#manual-install">other installation methods</a>.</p>
-        </div>
-
-        <hr/>
-
-        <div>
-          <p>
-            If you are running Windows,<br/>follow the instructions on
-            <a class="windows-download" href="https://www.haskell.org/platform/#windows">Haskell Platform</a>
-          </p>
-        </div>
-
-      </div>
-
-      <p>
-        Need help? Ask on <a href="https://kiwiirc.com/nextclient/irc.libera.chat/#haskell-ghcup">#haskell-ghcup</a>, <a href="https://kiwiirc.com/nextclient/irc.libera.chat/#haskell">#haskell</a> or <a href="https://gitlab.haskell.org/haskell/ghcup-hs/issues">report a bug</a>.
-      </p>
-
-      <p id="about">
-        <img src="haskell-logo.svg" alt="" />
-        ghcup is a haskell.org hosted project.
-        <br/>
-        <a href="https://www.haskell.org/downloads/">other installation options</a>
-        &nbsp;&middot;&nbsp;
-        <a href="https://gitlab.haskell.org/haskell/ghcup-hs">about ghcup</a>
-        &nbsp;&middot;&nbsp;
-        <a href="https://github.com/rust-lang/rustup.rs/tree/master/www">web design from rustup</a>
-      </p>
-
-    </noscript>
   </body>
 </html>