From 5ebeb6cd52488609a1315132982c49a5577aba11 Mon Sep 17 00:00:00 2001
From: Jack-Benny Persson <jack-benny@cyberinfo.se>
Date: Tue, 10 Dec 2013 18:54:41 +0100
Subject: [PATCH] =?UTF-8?q?B=C3=B6rjat=20p=C3=A5=20=C3=B6vningarna=20p?=
 =?UTF-8?q?=C3=A5=20labb=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Labb2/invoice.sh            | 16 ++++++++++++++++
 Labb2/laborationsrapport.md |  8 ++++++--
 Labb2/ovning1.sh            |  9 +++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100755 Labb2/invoice.sh
 create mode 100755 Labb2/ovning1.sh

diff --git a/Labb2/invoice.sh b/Labb2/invoice.sh
new file mode 100755
index 0000000..30cc147
--- /dev/null
+++ b/Labb2/invoice.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+Datum=`date +%F`
+Moms=30
+Net=500
+
+printf "Invoice" 
+printf "%40s" "$Datum"
+printf "\n-------"
+printf "%40s" "----------"
+printf "\n\n\n"
+printf "%49s" "Net Total: "$Net
+printf "\n"
+printf "%40s" "Tax: "
+printf "%d%%" $Moms
+printf "\n"
diff --git a/Labb2/laborationsrapport.md b/Labb2/laborationsrapport.md
index 653ff64..b9b6ab7 100644
--- a/Labb2/laborationsrapport.md
+++ b/Labb2/laborationsrapport.md
@@ -6,6 +6,10 @@ Att förstå ett grundläggande bash-script, kunna hantera variabler och läsa d
 
 ## Tillvägagångssätt ##
 
-### Test & experiment ###
+### Test, experiment & noteringar ###
+
+Under tiden laborationen läses igenom testas en del olika nya saker, framförallt med _read_ och _printf_. De exempel som ges i laborationen känns nyttiga och lite vidare utforskning av _printf_ görs.
+
+### Övningar ###
+
 
-Under tiden laborationen läses igenom testas en del olika nya saker, framförallt med "read" och "printf".
diff --git a/Labb2/ovning1.sh b/Labb2/ovning1.sh
new file mode 100755
index 0000000..e65d5df
--- /dev/null
+++ b/Labb2/ovning1.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+printf "Hej $USER, du befinner dig i $PWD\n";
+
+if [ $? -ne 0 ]; then
+	exit 1
+else
+	exit 0
+fi