Disable cabal XDG by default

cabal.project

@@ -13,11 +13,6 @@ source-repository-package
   location: https://github.com/fosskers/versions.git
   tag: 7bc3355348aac3510771d4622aff09ac38c9924d
 
-source-repository-package
-  type: git
-  location: https://github.com/hasufell/uri-bytestring.git
-  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001
-
 package libarchive
   flags: -system-libarchive
 

lib/GHCup/Download.hs

@@ -855,7 +855,7 @@ getGpgOpts =
 -- "baz"
 urlBaseName :: ByteString  -- ^ the url path (without scheme and host)
             -> ByteString
-urlBaseName = snd . B.breakEnd (== _slash)
+urlBaseName = snd . B.breakEnd (== _slash) . urlDecode False
 
 
 -- | Curl saves all intermediate connect headers as well, not just the last one, so we make an effort to take the

scripts/bootstrap/bootstrap-haskell

@@ -12,6 +12,7 @@
 #   * BOOTSTRAP_HASKELL_VERBOSE - any nonzero value for more verbose installation
 #   * BOOTSTRAP_HASKELL_GHC_VERSION - the ghc version to install
 #   * BOOTSTRAP_HASKELL_CABAL_VERSION - the cabal version to install
+#   * BOOTSTRAP_HASKELL_CABAL_XDG - don't disable the XDG logic (this doesn't force XDG though, because cabal is confusing)
 #   * BOOTSTRAP_HASKELL_INSTALL_NO_STACK - disable installation of stack
 #   * BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK - disable installation stack ghcup hook
 #   * BOOTSTRAP_HASKELL_INSTALL_HLS - whether to install latest hls
@@ -820,6 +821,15 @@ if [ -z "${BOOTSTRAP_HASKELL_MINIMAL}" ] ; then
 
 	do_cabal_config_init $ask_cabal_config_init_answer
 
+    if [ -z "${BOOTSTRAP_HASKELL_CABAL_XDG}" ] ; then
+        # disable XDG if we can
+        if [ -e "${XDG_CONFIG_HOME:-"$HOME/.config"}/cabal" ] || [ -n "${CABAL_DIR}" ] || [ -n "${CABAL_CONFIG}" ] ; then
+            :
+        else
+            edo mkdir -p "${HOME}/.cabal"
+        fi
+    fi
+
 	edo cabal update --ignore-project
 else # don't install ghc and cabal
 	case "${plat}" in