Skip to content

Commit c89fe93

Browse files
committed
fix bash code for better copying in README
1 parent 539e971 commit c89fe93

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

README.md

+17-14
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The language specification can be found [here](lama-spec.pdf).
4141

4242
Supported target: GNU/Linux x86_32 (x86_64 by running 32-bit mode)
4343

44-
***Mac*** users should use either a virtual machine or docker with a Linux distributive inside.
44+
***Mac*** users should connect by ssh to the docker container docker with a Linux distributive inside.
4545

4646
***Windows*** users should get Windows Subsystem for Linux a.k.a WSL (recommended) or cygwin.
4747
Ubuntu-based variant of WSL is recommended.
@@ -52,7 +52,7 @@ Ubuntu-based variant of WSL is recommended.
5252

5353
For example, (for Debian-based GNU/Linux):
5454
```bash
55-
$ sudo apt install gcc-multilib
55+
sudo apt install gcc-multilib
5656
```
5757

5858
On some versions, you need to install the additional package `lib32gcc-V-dev` (where `V` is output of `gcc --version`, e. g. `sudo apt install lib32gcc-9-dev`) in case of errors like
@@ -70,44 +70,47 @@ Ubuntu-based variant of WSL is recommended.
7070

7171
1. Install the right [switch](https://opam.ocaml.org/doc/Manual.html#Switches) for the OCaml compiler
7272

73+
for fresh opam
7374
```bash
74-
# for fresh opam
75-
$ opam switch create lama --packages=ocaml-variants.4.14.0+options,ocaml-option-flambda
76-
# for old opam
77-
$ opam switch create lama ocaml-variants.4.13.1+flambda
75+
opam switch create lama --packages=ocaml-variants.4.14.0+options,ocaml-option-flambda
76+
```
77+
for old opam
78+
```bash
79+
opam switch create lama ocaml-variants.4.13.1+flambda
7880
```
7981

8082
* In the above command:
8183

8284
- `opam switch create` is a subcommand to create a new switch
83-
- `ocaml-variants.4.10.1+flambda` is the name of a standard template for the switch
85+
- `ocaml-variants.4.14.0+flambda` is the name of a standard template for the switch
8486
- `lama` is an alias for the switch being created; on success a directory `$(HOME)/.opam/lama` should be created
8587

8688
2. Update PATH variable for the fresh switch. (You can add these commands to your `~/.bashrc` for convenience but they should be added by `opam`)
8789
```bash
88-
$ export OPAMSWITCH=lama
89-
$ eval $(opam env)
90+
eval $(opam env --switch=lama)
9091
```
9192

9293
* Check that the OCaml compiler is now available in PATH by running `which ocamlc`; it should answer with `/home/user/.opam/lama/bin/ocamlc` (or similar) and `ocamlc -v` should answer with
9394
```
94-
The OCaml compiler, version 4.10.1
95+
The OCaml compiler, version 4.14.0
9596
Standard library directory: /home/user/.opam/lama/lib/ocaml
9697
```
9798

9899
3. Pin Lama package using `opam` and right URL (remember of "#" being a comment character in various shells)
99100

100101
```bash
101-
$ opam pin add Lama https://github.com/PLTools/Lama.git\#v1.2 --no-action
102+
opam pin add Lama https://github.com/PLTools/Lama.git\#v1.2 --no-action
102103
```
103104

104105
The extra '#' sign is added because in various Shells it is the start of a comment
105106

106107
4. Install *dep*endencies on system-wide *ext*ernal packages and `lama` itself after that.
107108

108109
```bash
109-
$ opam depext Lama --yes
110-
$ opam install Lama --yes
110+
opam depext Lama --yes
111+
```
112+
```bash
113+
opam install Lama --yes
111114
```
112115

113116
5. Check that `lamac` executable was installed: `which lamac` should answer with
@@ -125,6 +128,6 @@ It should build a local compiler `src/lamac` and a few tutorial executables in `
125128

126129
* [Plugin for VS Code](https://marketplace.visualstudio.com/items?itemName=mrartemsav.lama-lsp)
127130

128-
### Changes in Lama 1.2
131+
### Changes in Lama 1.20
129132

130133
* New garbage collector: single-threaded stop-the-world `LISP2` (see GC Handbook for details: [1st edition](https://www.cs.kent.ac.uk/people/staff/rej/gcbook/), [2nd edition](http://gchandbook.org/)) [mark-compact](https://www.memorymanagement.org/glossary/m.html#term-mark-compact).

0 commit comments

Comments
 (0)