From 1bb02a9e19b3d14be5ba40645818acaba3406862 Mon Sep 17 00:00:00 2001
From: Fredrik Bagge Carlson <cont-frb@ulund.org>
Date: Tue, 22 Aug 2017 14:26:11 +0200
Subject: [PATCH] Update install instructions

---
 README.md         |  6 +++---
 docs/src/index.md | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6e0c148..6830c54 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Installation
+# Installation (specific to lab 1 FRTN35: Frequency response analysis)
 1. Open a terminal
-2. Type `printf 'export JULIA_PKGDIR=/work/$USER\nexport JULIA_EDITOR=gedit' >> .bashrc`. Restart the terminal. (Feel free to choose another text editor if you don't like gedit.)
+2. Type `export JULIA_PKGDIR=/var/tmp/$USER; export JULIA_EDITOR=gedit`. (Feel free to choose another text editor if you don't like gedit.) At the moment, this has to be done every time you restart the terminal (Anders Blomdell will fix). 
 3. Type `mkdir FRTN35_lab1; cd FRTN35_lab1`
 4. Start `julia`
-5. Install `BallAndBeam.jl` using command `Pkg.clone("https://gitlab.control.lth.se/processes/BallAndBeam.jl.git")` Lots of packages will now be installed, this will take some time.
+5. Install `BallAndBeam.jl` using command `Pkg.clone("https://gitlab.control.lth.se/processes/BallAndBeam.jl.git"); using BallAndBeam` Lots of packages will now be installed, this will take some time.
 6. Type `cp(Pkg.dir("BallAndBeam","src","FRTN35_lab1.jl"), "FRTN35_lab1.jl"); edit("FRTN35_lab1.jl")`. The script `FRTN35_lab1.jl` will now open in the chosen text editor, edit it while following the lab manual. If unsure about how a function works, type `?function_name` for help.
 
 # Documentation
diff --git a/docs/src/index.md b/docs/src/index.md
index f998ddc..cd0a601 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -5,8 +5,7 @@ Depth = 3
 ```
 
 # Installation
-Install `BallAndBeam.jl` using command `Pkg.clone("https://gitlab.control.lth.se/labdev/software/tree/master/julia_ballandbeam/BallAndBeam.jl.git")` Lots of packages will now be installed, this will take some time.
-Example usage is illustrated for lab 1 in FRTN35: Frequency Response Analysis of the beam (see below).
+Install `BallAndBeam.jl` using command `Pkg.clone("https://gitlab.control.lth.se/processes/BallAndBeam.jl.git")` Lots of packages will now be installed, this will take some time.
 
 
 # Exported functions and types
@@ -21,13 +20,13 @@ Pages   = ["BallAndBeam.jl"]
 
 # Lab 1 FRTN35
 The script `FRTN35_lab1.jl` provides example usage of the functionality required to perform the lab. To get started, do the following
+
 1. Open a terminal
-2. Type `export JULIA_PKGDIR=/work/$USER\n export JULIA_EDITOR=gedit >> .bashrc`. Restart the terminal.
+2. Type `export JULIA_PKGDIR=/var/tmp/$USER; export JULIA_EDITOR=gedit`. Restart the terminal. (Feel free to choose another text editor if you don't like gedit.)
 3. Type `mkdir FRTN35_lab1; cd FRTN35_lab1`
 4. Start `julia`
-5. Install `BallAndBeam.jl` using command `Pkg.clone("https://gitlab.control.lth.se/labdev/software/tree/master/julia_ballandbeam/BallAndBeam.jl.git")` Lots of packages will now be installed, this will take some time.
-6. Type `cp(Pkg.dir("BallAndBeam","src","FRTN35_lab1.jl"), "."); edit("FRTN35_lab1.jl")`. The script `FRTN35_lab1.jl` will now open in a text editor, edit it while following the lab manual. If unsure about how a function works, type `?function_name` for help.
-
+5. Install `BallAndBeam.jl` using command `Pkg.clone("https://gitlab.control.lth.se/processes/BallAndBeam.jl.git"); using BallAndBeam` Lots of packages will now be installed, this will take some time.
+6. Type `cp(Pkg.dir("BallAndBeam","src","FRTN35_lab1.jl"), "FRTN35_lab1.jl"); edit("FRTN35_lab1.jl")`. The script `FRTN35_lab1.jl` will now open in the chosen text editor, edit it while following the lab manual. If unsure about how a function works, type `?function_name` for help.
 
 # Index
 
-- 
GitLab