Add ListAvailable to ListCriteria

.gitlab-ci.yml

@@ -86,7 +86,7 @@ variables:
 
 .freebsd12:
   tags:
-    - x86_64-freebsd12
+    - x86_64-freebsd
   variables:
     OS: "FREEBSD"
     ARCH: "64"

app/ghcup/Main.hs

@@ -824,7 +824,7 @@ listOpts =
     <$> optional
           (option
             (eitherReader toolParser)
-            (short 't' <> long "tool" <> metavar "<ghc|cabal>" <> help
+            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|stack>" <> help
               "Tool to list versions for. Default is all"
             )
           )
@@ -833,8 +833,8 @@ listOpts =
             (eitherReader criteriaParser)
             (  short 'c'
             <> long "show-criteria"
-            <> metavar "<installed|set>"
-            <> help "Show only installed or set tool versions"
+            <> metavar "<installed|set|available>"
+            <> help "Show only installed/set/available tool versions"
             )
           )
     <*> switch
@@ -1429,6 +1429,8 @@ toolVersionEither s' =
 toolParser :: String -> Either String Tool
 toolParser s' | t == T.pack "ghc"   = Right GHC
               | t == T.pack "cabal" = Right Cabal
+              | t == T.pack "hls"   = Right HLS
+              | t == T.pack "stack" = Right Stack
               | otherwise           = Left ("Unknown tool: " <> s')
   where t = T.toLower (T.pack s')
 
@@ -1436,6 +1438,7 @@ toolParser s' | t == T.pack "ghc"   = Right GHC
 criteriaParser :: String -> Either String ListCriteria
 criteriaParser s' | t == T.pack "installed" = Right ListInstalled
                   | t == T.pack "set"       = Right ListSet
+                  | t == T.pack "available" = Right ListAvailable
                   | otherwise               = Left ("Unknown criteria: " <> s')
   where t = T.toLower (T.pack s')
 

lib/GHCup.hs

@@ -1335,6 +1335,7 @@ warnAboutHlsCompatibility = do
 -- | Filter data type for 'listVersions'.
 data ListCriteria = ListInstalled
                   | ListSet
+                  | ListAvailable
                   deriving Show
 
 -- | A list result describes a single tool version
@@ -1677,6 +1678,7 @@ listVersions lt' criteria = do
     Nothing            -> lr
     Just ListInstalled -> filter (\ListResult {..} -> lInstalled) lr
     Just ListSet       -> filter (\ListResult {..} -> lSet) lr
+    Just ListAvailable -> filter (\ListResult {..} -> not lNoBindist) lr
 
 
 

scripts/bootstrap/bootstrap-haskell

@@ -52,57 +52,41 @@ esac
 
 
 die() {
-    if [ -n "${NO_COLOR}" ] ; then
-        (>&2 printf "%s\\n" "$1")
-    else
-        (>&2 printf "\\033[0;31m%s\\033[0m\\n" "$1")
-    fi
+    (>&2 printf "\\033[0;31m%s\\033[0m\\n" "$1")
     exit 2
 }
 
 warn() {
-    if [ -n "${NO_COLOR}" ] ; then
-        printf "%s\\n" "$1"
-    else
-        case "${plat}" in
-                MSYS*|MINGW*)
-                    echo -e "\\033[0;35m$1\\033[0m"
-                    ;;
-                *)
-                    printf "\\033[0;35m%s\\033[0m\\n" "$1"
-                    ;;
-        esac
-    fi
+	case "${plat}" in
+			MSYS*|MINGW*)
+				echo -e "\\033[0;35m$1\\033[0m"
+				;;
+			*)
+				printf "\\033[0;35m%s\\033[0m\\n" "$1"
+				;;
+	esac
 }
 
 yellow() {
-    if [ -n "${NO_COLOR}" ] ; then
-        printf "%s\\n" "$1"
-    else
-        case "${plat}" in
-                MSYS*|MINGW*)
-                    echo -e "\\033[0;33m$1\\033[0m"
-                    ;;
-                *)
-                    printf "\\033[0;33m%s\\033[0m\\n" "$1"
-                    ;;
-        esac
-    fi
+	case "${plat}" in
+			MSYS*|MINGW*)
+				echo -e "\\033[0;33m$1\\033[0m"
+				;;
+			*)
+				printf "\\033[0;33m%s\\033[0m\\n" "$1"
+				;;
+	esac
 }
 
 green() {
-    if [ -n "${NO_COLOR}" ] ; then
-        printf "%s\\n" "$1"
-    else
-        case "${plat}" in
-                MSYS*|MINGW*)
-                    echo -e "\\033[0;32m$1\\033[0m"
-                    ;;
-                *)
-                    printf "\\033[0;32m%s\\033[0m\\n" "$1"
-                    ;;
-        esac
-    fi
+	case "${plat}" in
+			MSYS*|MINGW*)
+				echo -e "\\033[0;32m$1\\033[0m"
+				;;
+			*)
+				printf "\\033[0;32m%s\\033[0m\\n" "$1"
+				;;
+	esac
 }
 
 edo() {