diff --git a/.travis.sh b/.travis.sh index 2517815..990fcc0 100755 --- a/.travis.sh +++ b/.travis.sh @@ -3,14 +3,14 @@ set -e # install GHCs -./ghcup.sh -v install 8.2.2 -./ghcup.sh -v install 8.4.3 -./ghcup.sh -v install 8.6.1 +./ghcup -v install 8.2.2 +./ghcup -v install 8.4.3 +./ghcup -v install 8.6.1 # set GHC -./ghcup.sh -v set 8.6.1 -./ghcup.sh -v set 8.4.3 -./ghcup.sh -v set 8.2.2 +./ghcup -v set 8.6.1 +./ghcup -v set 8.4.3 +./ghcup -v set 8.2.2 # install cabal-install wget https://www.haskell.org/cabal/release/cabal-install-2.2.0.0/cabal-install-2.2.0.0-x86_64-unknown-linux.tar.gz diff --git a/README.md b/README.md index cde48fe..95b3119 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,12 @@ Inspired by [rustup](https://github.com/rust-lang-nursery/rustup.rs). ## Installation -Just place `ghcup.sh` into your PATH anywhere +Just place the `ghcup` shell script into your PATH anywhere (preferably `~/.local/bin`). ## Usage -See `ghcup.sh --help`. +See `ghcup --help`. ## Contributing diff --git a/ghcup.sh b/ghcup similarity index 98% rename from ghcup.sh rename to ghcup index 5396d4b..519ce78 100755 --- a/ghcup.sh +++ b/ghcup @@ -96,7 +96,7 @@ ARGS: self_update_usage() { (>&2 echo "ghcup-self-update -Update the ghcup.sh script in-place +Update the ghcup script in-place USAGE: ${SCRIPT} self-update [FLAGS] [TARGET-LOCATION] @@ -361,7 +361,7 @@ set_ghc() { self_update() { target_location=$1 - source_url="https://raw.githubusercontent.com/hasufell/ghcup/master/ghcup.sh" + source_url="https://raw.githubusercontent.com/hasufell/ghcup/master/ghcup" downloader=curl downloader_opts="--fail -O" @@ -375,8 +375,8 @@ self_update() { echov "Downloading ${source_url}" # shellcheck disable=SC2086 edo ${downloader} ${downloader_opts} "${source_url}" - edo mv ghcup.sh "${target_location}"/ghcup.sh - edo chmod +x "${target_location}"/ghcup.sh + edo mv ghcup "${target_location}"/ghcup + edo chmod +x "${target_location}"/ghcup ) printf_green "Done, make sure \"${target_location}\" is in your PATH!"