Allow unpacking legacy lzma archives, fixes #307

app/ghcup/GHCup/OptParse.hs

@@ -15,9 +15,7 @@ module GHCup.OptParse (
   , module GHCup.OptParse.Config
   , module GHCup.OptParse.Whereis
   , module GHCup.OptParse.List
-#ifndef DISABLE_UPGRADE
   , module GHCup.OptParse.Upgrade
-#endif
   , module GHCup.OptParse.ChangeLog
   , module GHCup.OptParse.Prefetch
   , module GHCup.OptParse.GC
@@ -37,9 +35,7 @@ import           GHCup.OptParse.Compile
 import           GHCup.OptParse.Config
 import           GHCup.OptParse.Whereis
 import           GHCup.OptParse.List
-#ifndef DISABLE_UPGRADE
 import           GHCup.OptParse.Upgrade
-#endif
 import           GHCup.OptParse.ChangeLog
 import           GHCup.OptParse.Prefetch
 import           GHCup.OptParse.GC
@@ -93,9 +89,7 @@ data Command
   | Compile CompileCommand
   | Config ConfigCommand
   | Whereis WhereisOptions WhereisCommand
-#ifndef DISABLE_UPGRADE
   | Upgrade UpgradeOpts Bool
-#endif
   | ToolRequirements
   | ChangeLog ChangeLogOptions
   | Nuke
@@ -214,7 +208,6 @@ com =
            (info (List <$> listOpts <**> helper)
                  (progDesc "Show available GHCs and other tools")
            )
-#ifndef DISABLE_UPGRADE
       <> command
            "upgrade"
            (info
@@ -225,7 +218,6 @@ com =
              )
              (progDesc "Upgrade ghcup")
            )
-#endif
       <> command
            "compile"
            (   Compile

app/ghcup/Main.hs

@@ -140,12 +140,7 @@ main = do
         <> hidden
         )
   let listCommands = infoOption
-        ("install set rm install-cabal list"
+        "install set rm install-cabal list upgrade compile debug-info tool-requirements changelog"
-#ifndef DISABLE_UPGRADE
-          <> " upgrade"
-#endif
-          <> " compile debug-info tool-requirements changelog"
-        )
         (  long "list-commands"
         <> help "List available commands for shell completion"
         <> internal
@@ -243,14 +238,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                              alreadyInstalling' <- alreadyInstalling optCommand newTool
                              when (not alreadyInstalling') $
                                case t of
-#ifdef DISABLE_UPGRADE
-                                 GHCup -> pure ()
-#else
                                  GHCup -> runLogger $
                                             logWarn ("New GHCup version available: "
                                               <> prettyVer l
                                               <> ". To upgrade, run 'ghcup upgrade'")
-#endif
                                  _ -> runLogger $
                                         logWarn ("New "
                                           <> T.pack (prettyShow t)
@@ -305,9 +296,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
             Config configCommand     -> config configCommand settings keybindings runLogger
             Whereis whereisOptions
                     whereisCommand   -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
-#ifndef DISABLE_UPGRADE
             Upgrade uOpts force'     -> upgrade uOpts force' dirs runAppState runLogger
-#endif
             ToolRequirements         -> toolRequirements runAppState runLogger
             ChangeLog changelogOpts  -> changelog changelogOpts runAppState runLogger
             Nuke                     -> nuke appState runLogger
@@ -350,9 +339,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
     (HLS, ver)   = cmp' HLS (Just $ ToolVersion (mkTVer over)) ver
   alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = Left tver }))
     (HLS, ver)   = cmp' HLS (Just $ ToolVersion (mkTVer tver)) ver
-#ifndef DISABLE_UPGRADE
   alreadyInstalling (Upgrade _ _) (GHCup, _) = pure True
-#endif
   alreadyInstalling _ _ = pure False
 
   cmp' :: ( HasLog env

ghcup.cabal

@@ -48,13 +48,6 @@ flag no-exe
   default:     False
   manual:      True
 
-flag disable-upgrade
-  description:
-    Build the brick powered tui (ghcup tui). This is disabled on windows.
-
-  default:     False
-  manual:      True
-
 library
   exposed-modules:
     GHCup
@@ -202,6 +195,7 @@ executable ghcup
     GHCup.OptParse.Set
     GHCup.OptParse.ToolRequirements
     GHCup.OptParse.UnSet
+    GHCup.OptParse.Upgrade
     GHCup.OptParse.Whereis
 
   hs-source-dirs:     app/ghcup
@@ -268,12 +262,6 @@ executable ghcup
   if flag(no-exe)
     buildable: False
 
-  if (flag(disable-upgrade))
-    cpp-options:   -DDISABLE_UPGRADE
-  else
-    other-modules:
-        GHCup.OptParse.Upgrade
-
 test-suite ghcup-test
   type:               exitcode-stdio-1.0
   main-is:            Main.hs

lib/GHCup/Utils.hs

@@ -715,7 +715,7 @@ unpackToDir dfp av = do
       (untar . GZip.decompress =<< rf av)
     | ".tar.xz" `isSuffixOf` fn -> do
       filecontents <- liftE $ rf av
-      let decompressed = Lzma.decompress filecontents
+      let decompressed = Lzma.decompressWith (Lzma.defaultDecompressParams { Lzma.decompressAutoDecoder= True }) filecontents
       liftE $ untar decompressed
     | ".tar.bz2" `isSuffixOf` fn ->
       liftE (untar . BZip.decompress =<< rf av)
@@ -744,7 +744,7 @@ getArchiveFiles av = do
       (entries . GZip.decompress =<< rf av)
     | ".tar.xz" `isSuffixOf` fn -> do
       filecontents <- liftE $ rf av
-      let decompressed = Lzma.decompress filecontents
+      let decompressed = Lzma.decompressWith (Lzma.defaultDecompressParams { Lzma.decompressAutoDecoder= True }) filecontents
       liftE $ entries decompressed
     | ".tar.bz2" `isSuffixOf` fn ->
       liftE (entries . BZip.decompress =<< rf av)

scripts/bootstrap/bootstrap-haskell

@@ -281,18 +281,18 @@ download_ghcup() {
 	# we may overwrite this in adjust_bashrc
 	cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
 		case ":\$PATH:" in
-		    *:"${GHCUP_BIN}":*)
+			*:"${GHCUP_BIN}":*)
-		        ;;
+				;;
-		    *)
+			*)
-		        export PATH="${GHCUP_BIN}:\$PATH"
+				export PATH="${GHCUP_BIN}:\$PATH"
-		        ;;
+				;;
 		esac
 		case ":\$PATH:" in
-		    *:"\$HOME/.cabal/bin":*)
+			*:"\$HOME/.cabal/bin":*)
-		        ;;
+				;;
-		    *)
+			*)
-		        export PATH="\$HOME/.cabal/bin:\$PATH"
+				export PATH="\$HOME/.cabal/bin:\$PATH"
-		        ;;
+				;;
 		esac
 		EOF
 
@@ -382,36 +382,36 @@ adjust_bashrc() {
 		1)
 			cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
 				case ":\$PATH:" in
-				    *:"${GHCUP_BIN}":*)
+					*:"${GHCUP_BIN}":*)
-				        ;;
+						;;
-				    *)
+					*)
-				        export PATH="${GHCUP_BIN}:\$PATH"
+						export PATH="${GHCUP_BIN}:\$PATH"
-				        ;;
+						;;
 				esac
 				case ":\$PATH:" in
-				    *:"\$HOME/.cabal/bin":*)
+					*:"\$HOME/.cabal/bin":*)
-				        ;;
+						;;
-				    *)
+					*)
-				        export PATH="\$HOME/.cabal/bin:\$PATH"
+						export PATH="\$HOME/.cabal/bin:\$PATH"
-				        ;;
+						;;
 				esac
 				EOF
 			;;
 		2)
 			cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
 				case ":\$PATH:" in
-				    *:"\$HOME/.cabal/bin":*)
+					*:"\$HOME/.cabal/bin":*)
-				        ;;
+						;;
-				    *)
+					*)
-				        export PATH="\$PATH:\$HOME/.cabal/bin"
+						export PATH="\$PATH:\$HOME/.cabal/bin"
-				        ;;
+						;;
 				esac
 				case ":\$PATH:" in
-				    *:"${GHCUP_BIN}":*)
+					*:"${GHCUP_BIN}":*)
-				        ;;
+						;;
-				    *)
+					*)
-				        export PATH="\$PATH:${GHCUP_BIN}"
+						export PATH="\$PATH:${GHCUP_BIN}"
-				        ;;
+						;;
 				esac
 				EOF
 			;;