From da988b1eaf4c496b70b1a77ed780c412e3ccb3bf Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 24 May 2019 16:22:40 +0800 Subject: [PATCH] Move away from github --- CONTRIBUTING.md | 12 ++++++------ README.md | 12 ++++-------- bootstrap-haskell | 2 +- ghcup | 4 ++-- www/index.html | 18 +++++++++--------- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1976775..c0332ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,17 +9,17 @@ This script makes use of two files: -1. [.download-urls](https://raw.githubusercontent.com/haskell/ghcup/master/.download-urls), +1. [.download-urls](https://gitlab.haskell.org/haskell/ghcup/raw/master/.download-urls), which is meta information on what binary tarball to download for the given version, architecture and distribution. If you know your distribution XY works with a tarball, add a `=` key to that line. `` will be the fallback and after that `unknown`. Lines are unique per tarball url. -2. [.available-versions](https://raw.githubusercontent.com/haskell/ghcup/master/.available-versions), +2. [.available-versions](https://gitlab.haskell.org/haskell/ghcup/raw/master/.available-versions), which just lists available upstream versions and tags. ## TODO -- [ ] FreeBSD support ([#4](https://github.com/haskell/ghcup/issues/4)) -- [x] Make fetching tarballs more robust ([#5](https://github.com/haskell/ghcup/issues/5)) +- [ ] FreeBSD support ([#4](https://gitlab.haskell.org/haskell/ghcup/issues/4)) +- [x] Make fetching tarballs more robust ([#5](https://gitlab.haskell.org/haskell/ghcup/issues/5)) - [x] More code documentation -- [x] Allow to compile from source ([#2](https://github.com/haskell/ghcup/issues/2)) -- [x] Allow to install cabal-install as well ([#3](https://github.com/haskell/ghcup/issues/3)) +- [x] Allow to compile from source ([#2](https://gitlab.haskell.org/haskell/ghcup/issues/2)) +- [x] Allow to install cabal-install as well ([#3](https://gitlab.haskell.org/haskell/ghcup/issues/3)) diff --git a/README.md b/README.md index 8835dc4..3059a30 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -[![GitHub release](https://img.shields.io/github/release/haskell/ghcup.svg)](https://github.com/haskell/ghcup/releases) -[![Build Status](https://travis-ci.org/haskell/ghcup.svg?branch=master)](https://travis-ci.org/haskell/ghcup) -[![license](https://img.shields.io/github/license/haskell/ghcup.svg)](COPYING) - `ghcup` makes it easy to install specific versions of `ghc` on GNU/Linux as well as macOS (aka Darwin), and can also bootstrap a fresh Haskell developer environment from scratch. It follows the unix UNIX philosophy of [do one thing and do it well](https://en.wikipedia.org/wiki/Unix_philosophy#Do_One_Thing_and_Do_It_Well). @@ -29,7 +25,7 @@ Choose one of the following installation methods. ```sh # complete bootstrap -curl https://raw.githubusercontent.com/haskell/ghcup/master/bootstrap-haskell -sSf | sh +curl https://gitlab.haskell.org/haskell/ghcup/raw/master/bootstrap-haskell -sSf | sh # prepare your environment . "$HOME/.ghcup/env" @@ -48,7 +44,7 @@ Just place the `ghcup` shell script into your `PATH` anywhere. E.g.: ```sh -( mkdir -p ~/.ghcup/bin && curl https://raw.githubusercontent.com/haskell/ghcup/master/ghcup > ~/.ghcup/bin/ghcup && chmod +x ~/.ghcup/bin/ghcup) && echo "Success" +( mkdir -p ~/.ghcup/bin && curl https://gitlab.haskell.org/haskell/ghcup/raw/master/ghcup > ~/.ghcup/bin/ghcup && chmod +x ~/.ghcup/bin/ghcup) && echo "Success" ``` Then adjust your `PATH` in `~/.bashrc` (or similar, depending on your shell) like so, for example: @@ -57,7 +53,7 @@ Then adjust your `PATH` in `~/.bashrc` (or similar, depending on your shell) lik export PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH" ``` -Security aware users may want to use the files from the [release page](https://github.com/haskell/ghcup/releases) +Security aware users may want to use the files from the [release page](https://gitlab.haskell.org/haskell/ghcup/tags/) and verify the gpg signatures. ## Usage @@ -136,7 +132,7 @@ try to compile from source via `ghcup compile `. This was a [bug](https://ghc.haskell.org/trac/ghc/ticket/15688) in the build system of some GHC versions that lead to unconditionally enabled libnuma support. To mitigate this you might have to install the libnuma -package of your distribution. See [here](https://github.com/haskell/ghcup/issues/58) for a discussion. +package of your distribution. See [here](https://gitlab.haskell.org/haskell/ghcup/issues/58) for a discussion. ### Compilation diff --git a/bootstrap-haskell b/bootstrap-haskell index abf9aed..736e978 100755 --- a/bootstrap-haskell +++ b/bootstrap-haskell @@ -47,7 +47,7 @@ if command -V "ghcup" >/dev/null 2>&1 ; then edo ghcup upgrade fi else - edo curl --silent https://raw.githubusercontent.com/haskell/ghcup/master/ghcup > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup + edo curl --silent https://gitlab.haskell.org/haskell/ghcup/raw/master/ghcup > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup edo chmod +x "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup cat <<-EOF > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/env || die "Failed to create env file" diff --git a/ghcup b/ghcup index 2ad25f9..02fd07d 100755 --- a/ghcup +++ b/ghcup @@ -124,7 +124,7 @@ SOURCE="$0" # @VARIABLE: BASE_DOWNLOAD_URL # DESCRIPTION: # The base url for downloading stuff like meta files, requirements files etc. -BASE_DOWNLOAD_URL="https://raw.githubusercontent.com/haskell/ghcup/master/" +BASE_DOWNLOAD_URL="https://gitlab.haskell.org/haskell/ghcup/raw/master/" # @VARIABLE: SCRIPT_UPDATE_URL # @DESCRIPTION: @@ -160,7 +160,7 @@ META_VERSION_FORMAT="1" # @VARIABLE: BUG_URL # DESCRIPTION: # The url to report bugs to. -BUG_URL="https://github.com/haskell/ghcup/issues" +BUG_URL="https://gitlab.haskell.org/haskell/ghcup/issues" # @VARIABLE: CACHING # @DESCRIPTION: diff --git a/www/index.html b/www/index.html index 6e92f49..71cadc5 100644 --- a/www/index.html +++ b/www/index.html @@ -27,19 +27,19 @@
@@ -64,7 +64,7 @@

ghcup runs on Linux, macOS and FreeBSD. If you are on one of these platforms and are seeing this then please - report an issue, + report an issue, along with the following values:

@@ -79,7 +79,7 @@

If you are running Linux, macOS or FreeBSD,
run the following in your terminal, then follow the onscreen instructions.

curl https://get-ghcup.haskell.org -sSf | sh
-

If you don't like curl | sh, see other installation methods.

+

If you don't like curl | sh, see other installation methods.

@@ -98,7 +98,7 @@

To install Haskell, if you are running Linux, macOS or FreeBSD,
run the following in your terminal, then follow the onscreen instructions.

curl https://get-ghcup.haskell.org -sSf | sh
-

If you don't like curl | sh, see other installation methods.

+

If you don't like curl | sh, see other installation methods.

@@ -122,7 +122,7 @@
other installation options  ·  - about ghcup + about ghcup  ·  web design from rustup

@@ -143,7 +143,7 @@

To install Haskell, if you are running Linux, macOS or FreeBSD,
run the following in your terminal, then follow the onscreen instructions.

curl https://get-ghcup.haskell.org -sSf | sh
-

If you don't like curl | sh, see other installation methods.

+

If you don't like curl | sh, see other installation methods.

@@ -167,7 +167,7 @@
other installation options  ·  - about ghcup + about ghcup  ·  web design from rustup