From 7ee74b12f854309060bfd324d8cf4b976a9ea07b Mon Sep 17 00:00:00 2001 From: ELNS Date: Wed, 17 Jun 2020 15:50:10 +0430 Subject: Adding pycharm hidden files and directories --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index fe86e64..339e3b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ .stack-work/ fpm.cabal *~ +/.idea/inspectionProfiles/profiles_settings.xml +/.idea/inspectionProfiles/Project_Default.xml +/.idea/.gitignore +/.idea/fpm.iml +/.idea/misc.xml +/.idea/modules.xml +/.idea/vcs.xml -- cgit v1.2.3 From 69079ba3bb7e93a67cbf191ca5e01596baa2090a Mon Sep 17 00:00:00 2001 From: ELNS Date: Wed, 17 Jun 2020 15:54:44 +0430 Subject: Adding navigating to directory and fixing export command --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 31759b3..2316b14 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,13 @@ Linux without root access, follow the [manual download](https://docs.haskellstac wget https://get.haskellstack.org/stable/linux-x86_64-static.tar.gz tar xaf linux-x86_64-static.tar.gz ``` +navigate to stack directory: +```bash +cd stack-2.1.3-linux-x86_64-static/ +``` and put the `stack` binary in your path, for example: ``` -export PATH="$PATH:`pwd`/stack-2.1.3-linux-x86_64-static/" +export PATH="$PATH:`pwd`" ``` ### Download this repository -- cgit v1.2.3 From 97be28708c36e7251eb7741a8308b55380fb8e84 Mon Sep 17 00:00:00 2001 From: ELNS Date: Wed, 17 Jun 2020 16:00:26 +0430 Subject: Highlight bash/shell code in markdown --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2316b14..2efaaec 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ As the prototype matures and we enter production, we will do our best to stay ba To install [Haskell Stack](https://haskellstack.org/) on Linux without root access, follow the [manual download](https://docs.haskellstack.org/en/stable/install_and_upgrade/#manual-download_2) procedure: -``` +```bash wget https://get.haskellstack.org/stable/linux-x86_64-static.tar.gz tar xaf linux-x86_64-static.tar.gz ``` @@ -27,13 +27,13 @@ navigate to stack directory: cd stack-2.1.3-linux-x86_64-static/ ``` and put the `stack` binary in your path, for example: -``` +```bash export PATH="$PATH:`pwd`" ``` ### Download this repository -``` +```bash git clone https://github.com/fortran-lang/fpm cd fpm ``` @@ -43,15 +43,15 @@ cd fpm Make sure that the development library of `gmp` is installed (e.g. `sudo apt install libgmp-dev` on Debian-derived Linux distributions) Build fpm using: -``` +```bash stack build ``` To test: -``` +```bash stack test ``` To install: -``` +```bash stack install ``` -- cgit v1.2.3 From 0e4a0b0fde0461f11b02891c27fc52fd29ce7133 Mon Sep 17 00:00:00 2001 From: ELNS Date: Wed, 17 Jun 2020 17:43:45 +0430 Subject: Removing imperfect manual installation guide for linux and adding haskell tool stack documentation instead --- README.md | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/README.md b/README.md index 2efaaec..388afc6 100644 --- a/README.md +++ b/README.md @@ -16,20 +16,7 @@ As the prototype matures and we enter production, we will do our best to stay ba ### Install Haskell -To install [Haskell Stack](https://haskellstack.org/) on -Linux without root access, follow the [manual download](https://docs.haskellstack.org/en/stable/install_and_upgrade/#manual-download_2) procedure: -```bash -wget https://get.haskellstack.org/stable/linux-x86_64-static.tar.gz -tar xaf linux-x86_64-static.tar.gz -``` -navigate to stack directory: -```bash -cd stack-2.1.3-linux-x86_64-static/ -``` -and put the `stack` binary in your path, for example: -```bash -export PATH="$PATH:`pwd`" -``` +To install [Haskell Stack](https://haskellstack.org/), follow these [instructions](https://docs.haskellstack.org/en/stable/README/) ### Download this repository -- cgit v1.2.3 From 1ca65f56d4bfece7d9863b7378e4c19ab36e0b43 Mon Sep 17 00:00:00 2001 From: ELNS Date: Wed, 17 Jun 2020 17:50:25 +0430 Subject: Removing unnecessary link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 388afc6..28f5ace 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ As the prototype matures and we enter production, we will do our best to stay ba ### Install Haskell -To install [Haskell Stack](https://haskellstack.org/), follow these [instructions](https://docs.haskellstack.org/en/stable/README/) +To install **Haskell Stack**, follow these [instructions](https://docs.haskellstack.org/en/stable/README/) ### Download this repository -- cgit v1.2.3 From 67378513c575c1ca922a7dfbc7dc81afe2c30f79 Mon Sep 17 00:00:00 2001 From: ELNS Date: Wed, 17 Jun 2020 19:18:05 +0430 Subject: Revert "Adding pycharm hidden files and directories" This reverts commit 7ee74b12 --- .gitignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index 339e3b8..fe86e64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ .stack-work/ fpm.cabal *~ -/.idea/inspectionProfiles/profiles_settings.xml -/.idea/inspectionProfiles/Project_Default.xml -/.idea/.gitignore -/.idea/fpm.iml -/.idea/misc.xml -/.idea/modules.xml -/.idea/vcs.xml -- cgit v1.2.3 From 95fd763b40e6cccebb9efc92aa78c69c7c53ad63 Mon Sep 17 00:00:00 2001 From: ELNS Date: Thu, 18 Jun 2020 13:06:48 +0430 Subject: Applying requested changes --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28f5ace..f6d3fd1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,8 @@ As the prototype matures and we enter production, we will do our best to stay ba ### Install Haskell -To install **Haskell Stack**, follow these [instructions](https://docs.haskellstack.org/en/stable/README/) +To install **Haskell Stack**, follow these [instructions](https://docs.haskellstack.org/en/stable/install_and_upgrade/) +, users without superuser (admin) permissions should follow the [manual installation](https://docs.haskellstack.org/en/stable/install_and_upgrade/#manual-download_2) procedure. ### Download this repository @@ -27,8 +28,6 @@ cd fpm ### Build and Test fpm -Make sure that the development library of `gmp` is installed (e.g. `sudo apt install libgmp-dev` on Debian-derived Linux distributions) - Build fpm using: ```bash stack build -- cgit v1.2.3