From 8a286156f63629d20fa2806310210c35034b6625 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 29 Sep 2021 11:37:16 +0200 Subject: [PATCH] Improve information regarding what the scripts do --- scripts/bootstrap/bootstrap-haskell | 4 +++ scripts/bootstrap/bootstrap-haskell.ps1 | 2 ++ www/index.html | 36 ++++++++++++------------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index 66b68ee..8831ce4 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -1,5 +1,9 @@ #!/bin/sh +# This script downloads the 'ghcup' binary into '~/.ghcup/bin/' and then runs an interactive +# installation that lets you choose various options. Below is a list of environment variables +# that affect the installation procedure. + # Main settings: # * BOOTSTRAP_HASKELL_NONINTERACTIVE - any nonzero value for noninteractive installation # * BOOTSTRAP_HASKELL_NO_UPGRADE - any nonzero value to not trigger the upgrade diff --git a/scripts/bootstrap/bootstrap-haskell.ps1 b/scripts/bootstrap/bootstrap-haskell.ps1 index 6c9d6c3..e351018 100644 --- a/scripts/bootstrap/bootstrap-haskell.ps1 +++ b/scripts/bootstrap/bootstrap-haskell.ps1 @@ -11,6 +11,8 @@ * 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" + + By default, the installation is non-interactive, unless you run it with 'Interactive $true'. #> param ( # Run an interactive installation diff --git a/www/index.html b/www/index.html index 9d56837..9eebe93 100644 --- a/www/index.html +++ b/www/index.html @@ -24,30 +24,29 @@

- To install Haskell,
run the following in a powershell session (as a non-admin user). + On Windows, to install Haskell,
run the following in a powershell session (as a non-admin user). 

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
-

If you want to run a non-interactive installation, change $true to $false at the end of the script.

If you're a Windows Subsystem 2 for Linux user run the following in your terminal, then follow the onscreen instructions to install Haskell.

@@ -58,18 +57,19 @@

-

You appear to be running Windows 32-bit. If not, display all supported installers.

+

What does this do?  ·  I'm not running Windows

-

You appear to be running Windows 64-bit. If not, display all supported installers.

+

What does this do?  ·  I'm not running Windows

@@ -130,7 +130,7 @@ If you are running Windows,
run the following in a powershell session (as a non-admin user). 
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
-

If you want to run a non-interactive installation, change $true to $false at the end of the script.

+

What does this do?

@@ -151,9 +151,9 @@ ghcup is a haskell.org supported project.
other installation options -  ·  +  ·  about ghcup -  ·  +  ·  web design from rustup