From 957867ff1c509ec4b9fd11f6c2954dcb71184ceb Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 22 Nov 2022 19:06:12 +0800 Subject: [PATCH] Fix remaining gitlab links wrt #692 --- app/ghcup/Main.hs | 2 +- docs/about.md | 4 ++-- docs/dev.md | 4 ++-- docs/guide.md | 16 ++++++++-------- docs/index.md | 6 +++--- docs/install.md | 4 ++-- docs/steps.md | 2 +- ghcup.cabal | 6 +++--- mkdocs.yml | 2 +- scripts/bootstrap/bootstrap-haskell | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/ghcup/Main.hs b/app/ghcup/Main.hs index 9a94a15..84e647a 100644 --- a/app/ghcup/Main.hs +++ b/app/ghcup/Main.hs @@ -161,7 +161,7 @@ ENV variables: * GHCUP_INSTALL_BASE_PREFIX: the base of ghcup (default: $HOME) * GHCUP_USE_XDG_DIRS: set to anything to use XDG style directories -Report bugs at |] +Report bugs at |] customExecParser (prefs showHelpOnError) diff --git a/docs/about.md b/docs/about.md index 7f7711f..06a05d8 100644 --- a/docs/about.md +++ b/docs/about.md @@ -42,8 +42,8 @@ All you wanted to know about GHCup. ## How to help -* if you want to contribute code or documentation, check out the [issue tracker](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues) and the [Development guide](./dev.md) -* if you want to propose features or write user feedback, feel free to [open a ticket](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/new?issue) +* if you want to contribute code or documentation, check out the [issue tracker](https://github.com/haskell/ghcup-hs/issues) and the [Development guide](./dev.md) +* if you want to propose features or write user feedback, feel free to [open a ticket](https://github.com/haskell/ghcup-hs/issues/new) * if you want to donate to the project, visit our [opencollective](https://opencollective.com/ghcup#category-CONTRIBUTE) page ## Design goals diff --git a/docs/dev.md b/docs/dev.md index a01a3cc..3f39315 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -69,9 +69,9 @@ Head over to: [https://github.com/haskell/ghcup-metadata#adding-a-new-ghc-versio ### Adding a new CLI command -An example illustration on how to deal with [optparse-applicative](https://hackage.haskell.org/package/optparse-applicative) can be seen here: [https://gitlab.haskell.org/haskell/ghcup-hs/-/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26](https://gitlab.haskell.org/haskell/ghcup-hs/-/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26) +An example illustration on how to deal with [optparse-applicative](https://hackage.haskell.org/package/optparse-applicative) can be seen here: [https://github.com/haskell/ghcup-hs/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26](https://github.com/haskell/ghcup-hs/commit/c19dd5ee8b2edbaf0336af143f1c75b6f4843e26) -Every subcommand now lives in its own module under [GHCup.OptParse.MyCommand](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/app/ghcup/GHCup/OptParse). +Every subcommand now lives in its own module under [GHCup.OptParse.MyCommand](https://github.com/haskell/ghcup-hs/tree/master/app/ghcup/GHCup/OptParse). ## Major refactors diff --git a/docs/guide.md b/docs/guide.md index f763ea1..03100f1 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -50,7 +50,7 @@ For man pages to work you need [man-db](http://man-db.nongnu.org/) as your `man` ## Shell-completion -Shell completions are in [scripts/shell-completions](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/scripts/shell-completions) directory of this repository. +Shell completions are in [scripts/shell-completions](https://github.com/haskell/ghcup-hs/tree/master/scripts/shell-completions) directory of this repository. For bash: install `shell-completions/bash` as e.g. `/etc/bash_completion.d/ghcup` (depending on distro) @@ -67,7 +67,7 @@ and make sure your bashrc sources the startup script # Configuration A configuration file can be put in `~/.ghcup/config.yaml`. The default config file -explaining all possible configurations can be found in this repo: [config.yaml](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/data/config.yaml). +explaining all possible configurations can be found in this repo: [config.yaml](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml). Partial configuration is fine. Command line options always override the config file settings. @@ -147,7 +147,7 @@ url-source: OwnSource: "https://some-url/ghcup-0.0.6.yaml" ``` -See [config.yaml](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/data/config.yaml) +See [config.yaml](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml) for more options. Alternatively you can do it via a cli switch: @@ -204,9 +204,9 @@ url-source: The scripts offered to install GHCup are available here: -* [bootstrap-haskell](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/scripts/bootstrap/bootstrap-haskell#L7) +* [bootstrap-haskell](https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell#L7) for Unix-like operating systems -* [bootstrap-haskell.ps1](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/scripts/bootstrap/bootstrap-haskell.ps1#L17) +* [bootstrap-haskell.ps1](https://github.com/haskell/ghcup-hs/blob/master/scripts/bootstrap/bootstrap-haskell.ps1) for Windows (PowerShell). This will, in turn, run the final bootstrap script (by default, that for the Unix-like operating systems). @@ -270,7 +270,7 @@ Compiling from source is supported for both source tarballs and arbitrary git re for a list of all available options. If you need to overwrite the existing `build.mk`, check the default files -in [data/build_mk](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/data/build_mk), copy them somewhere, adjust them and +in [data/build_mk](https://github.com/haskell/ghcup-hs/tree/master/data/build_mk), copy them somewhere, adjust them and pass `--config path/to/build.mk` to `ghcup compile ghc`. Common `build.mk` options are explained [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/using#build-configuration). @@ -467,8 +467,8 @@ to download ghcup. There are two known workarounds: -1. Tell curl to ignore certificate errors (dangerous): `curl -k https://gitlab.haskell.org/haskell/ghcup-hs/-/raw/master/scripts/bootstrap/bootstrap-haskell | GHCUP_CURL_OPTS="-k" sh` -2. Try to use wget instead: `wget -O /dev/stdout https://gitlab.haskell.org/haskell/ghcup-hs/-/raw/master/scripts/bootstrap/bootstrap-haskell | BOOTSTRAP_HASKELL_DOWNLOADER=wget sh` +1. Tell curl to ignore certificate errors (dangerous): `curl -k https://raw.githubusercontent.com/haskell/ghcup-hs/master/scripts/bootstrap/bootstrap-haskell | GHCUP_CURL_OPTS="-k" sh` +2. Try to use wget instead: `wget -O /dev/stdout https://raw.githubusercontent.com/haskell/ghcup-hs/master/scripts/bootstrap/bootstrap-haskell | BOOTSTRAP_HASKELL_DOWNLOADER=wget sh` On windows, you can disable curl like so: diff --git a/docs/index.md b/docs/index.md index cb35025..681a890 100644 --- a/docs/index.md +++ b/docs/index.md @@ -35,7 +35,7 @@ hide:
- What does this do?  ·  I don't like curl | sh
 ·  Show all platforms

+ What does this do?  ·  I don't like curl | sh
 ·  Show all platforms

@@ -51,7 +51,7 @@ hide:
- What does this do?  ·  I don't like curl | sh
 ·  Show all platforms

+ What does this do?  ·  I don't like curl | sh
 ·  Show all platforms

@@ -77,7 +77,7 @@ hide: or - + report a bug diff --git a/docs/install.md b/docs/install.md index dbd16ac..5fd027c 100644 --- a/docs/install.md +++ b/docs/install.md @@ -24,7 +24,7 @@ Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager There's also a [youtube video](https://www.youtube.com/watch?v=bB4fmQiUYPw) explaining installation on windows. -If you want to know what these scripts do, check out the [source code at the repository](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/scripts/bootstrap). Advanced users may want to perform a [manual installation](#manual-install) and GPG verify the binaries. +If you want to know what these scripts do, check out the [source code at the repository](https://github.com/haskell/ghcup-hs/tree/master/scripts/bootstrap). Advanced users may want to perform a [manual installation](#manual-install) and GPG verify the binaries. ### Which versions get installed? @@ -260,7 +260,7 @@ On Linux, some users have reported an issue when VSCode is not launched from a t ## Get help * [Libera IRC chat on #haskell-ghcup or #haskell](https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup) -* [GHCup issue tracker](https://gitlab.haskell.org/haskell/ghcup-hs/issues) +* [GHCup issue tracker](https://github.com/haskell/ghcup-hs/issues/new) * [Matrix](https://app.element.io/#/room/#haskell-tooling:matrix.org) * [Discord](https://discord.gg/pKYf3zDQU7) diff --git a/docs/steps.md b/docs/steps.md index 7abb4cf..4048df8 100644 --- a/docs/steps.md +++ b/docs/steps.md @@ -343,7 +343,7 @@ To learn Haskell, try any of those: * [https://github.com/haskell/haskell-language-server](https://github.com/haskell/haskell-language-server) * [https://github.com/haskell/cabal](https://github.com/haskell/cabal) * [https://github.com/commercialhaskell/stack](https://github.com/commercialhaskell/stack) -* [https://gitlab.haskell.org/haskell/ghcup-hs](https://gitlab.haskell.org/haskell/ghcup-hs) +* [https://github.com/haskell/ghcup-hs](https://github.com/haskell/ghcup-hs) * [https://github.com/jgm/pandoc](https://github.com/jgm/pandoc) * [https://github.com/simonmichael/hledger](https://github.com/simonmichael/hledger) * [https://github.com/koalaman/shellcheck](https://github.com/koalaman/shellcheck) diff --git a/ghcup.cabal b/ghcup.cabal index d29a643..65d62c6 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -6,8 +6,8 @@ license-file: LICENSE copyright: Julian Ospald 2020 maintainer: hasufell@posteo.de author: Julian Ospald -homepage: https://gitlab.haskell.org/haskell/ghcup-hs -bug-reports: https://gitlab.haskell.org/haskell/ghcup-hs/issues +homepage: https://github.com/haskell/ghcup-hs +bug-reports: https://github.com/haskell/ghcup-hs/issues/ synopsis: ghc toolchain installer description: A rewrite of the shell script ghcup, for providing @@ -29,7 +29,7 @@ extra-source-files: source-repository head type: git - location: https://gitlab.haskell.org/haskell/ghcup-hs.git + location: https://github.com/haskell/ghcup-hs.git flag tui description: diff --git a/mkdocs.yml b/mkdocs.yml index 7a24bcb..7e97a87 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,7 +4,7 @@ site_description: GHCup is the main installer for the general purpose language H site_author: GHCup Team site_favicon: haskell_logo.png -repo_url: https://gitlab.haskell.org/haskell/ghcup-hs +repo_url: https://github.com/haskell/ghcup-hs theme: name: mkdocs diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index b9c10b6..31bfd92 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -287,7 +287,7 @@ download_ghcup() { elif freebsd-version | grep -E '^13.*' ; then freebsd_ver=13 else - die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues" + die "Unsupported FreeBSD version! Please report a bug at https://github.com/haskell/ghcup-hs/issues" fi case "${arch}" in