From 420571202da8c16560c3cfbeed949ff3014d7249 Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 4 Jan 2020 03:14:23 +0100 Subject: [PATCH 1/6] Add script to install with cabal --- cabal-install.cmd | 1 + 1 file changed, 1 insertion(+) create mode 100644 cabal-install.cmd diff --git a/cabal-install.cmd b/cabal-install.cmd new file mode 100644 index 000000000..06e3b7535 --- /dev/null +++ b/cabal-install.cmd @@ -0,0 +1 @@ +cabal v2-run install.hs --project-file=install\shake.project %* \ No newline at end of file From ce553e978d4001ffaf356358a2800e39d59ffbb5 Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 4 Jan 2020 16:07:17 +0100 Subject: [PATCH 2/6] Rename script --- cabal-hie-install.cmd | 1 + cabal-install.cmd | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 cabal-hie-install.cmd delete mode 100644 cabal-install.cmd diff --git a/cabal-hie-install.cmd b/cabal-hie-install.cmd new file mode 100644 index 000000000..0ccee8922 --- /dev/null +++ b/cabal-hie-install.cmd @@ -0,0 +1 @@ +@cabal v2-run install.hs --project-file=install\shake.project %* \ No newline at end of file diff --git a/cabal-install.cmd b/cabal-install.cmd deleted file mode 100644 index 06e3b7535..000000000 --- a/cabal-install.cmd +++ /dev/null @@ -1 +0,0 @@ -cabal v2-run install.hs --project-file=install\shake.project %* \ No newline at end of file From eb0bb0175fe61eda9d0cec439db6b477a34eeedb Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 4 Jan 2020 17:12:28 +0100 Subject: [PATCH 3/6] Add script for posix --- cabal-hie-install | 1 + 1 file changed, 1 insertion(+) create mode 100644 cabal-hie-install diff --git a/cabal-hie-install b/cabal-hie-install new file mode 100644 index 000000000..13647a367 --- /dev/null +++ b/cabal-hie-install @@ -0,0 +1 @@ +cabal v2-run ./install.hs --project-file install/shake.project $@ \ No newline at end of file From e401b6a73ccadf9dd139c1c3ffb5a8bf6014fee2 Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 4 Jan 2020 17:17:25 +0100 Subject: [PATCH 4/6] Mention the script in the readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 720896309..5c3876365 100644 --- a/README.md +++ b/README.md @@ -218,6 +218,12 @@ The install-script can be invoked via `cabal` instead of `stack` with the comman cabal v2-run ./install.hs --project-file install/shake.project ``` +or using the existing alias script + +```bash +cabal-hie-install +``` + Running the script with cabal on windows requires a cabal version greater or equal to `3.0.0.0`. Unfortunately, it is still required to have `stack` installed so that the install-script can locate the `local-bin` directory (on Linux `~/.local/bin`) and copy the `hie` binaries to `hie-x.y.z`, which is required for the `hie-wrapper` to function as expected. There are plans to remove this requirement and let users build hie only with one build tool or another. From 460cf1f4f36e8477ca911edad9ebf0f5175942b1 Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 4 Jan 2020 17:36:04 +0100 Subject: [PATCH 5/6] Add missing file path seps --- README.md | 2 +- cabal-hie-install.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5c3876365..da1a75364 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ cabal v2-run ./install.hs --project-file install/shake.project or using the existing alias script ```bash -cabal-hie-install +./cabal-hie-install ``` Running the script with cabal on windows requires a cabal version greater or equal to `3.0.0.0`. diff --git a/cabal-hie-install.cmd b/cabal-hie-install.cmd index 0ccee8922..866f987b8 100644 --- a/cabal-hie-install.cmd +++ b/cabal-hie-install.cmd @@ -1 +1 @@ -@cabal v2-run install.hs --project-file=install\shake.project %* \ No newline at end of file +@cabal v2-run .\install.hs --project-file=install\shake.project %* \ No newline at end of file From d388bdf822b24182a3cb5eeaeed1356379ebee19 Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 4 Jan 2020 22:44:30 +0100 Subject: [PATCH 6/6] Set executable mode --- cabal-hie-install | 1 + 1 file changed, 1 insertion(+) diff --git a/cabal-hie-install b/cabal-hie-install index 13647a367..eebdee21e 100644 --- a/cabal-hie-install +++ b/cabal-hie-install @@ -1 +1,2 @@ +#!/bin/sh cabal v2-run ./install.hs --project-file install/shake.project $@ \ No newline at end of file