Finished Övning 4, calculator

Labb6/ovning4/add.sh

@@ -0,0 +1 @@
+calc.sh

Labb6/ovning4/calc.sh

@@ -9,26 +9,68 @@
 Nr1=$1
 Nr2=$2
 
+# Sanity check
+if [ $# -ne 2 ]; then
+	echo "`basename $0` requires two arguments"
+	exit 2
+fi
+
+if ! [ $Nr1 -eq $Nr2 &> /dev/null ]; then
+	echo "`basename $0` only takes integers"
+	exit 2
+fi
+
 # Define our functions
 add()
 {
 	Sum=$((Nr1+Nr2))
+	return $Sum
 }
 
 sub()
 {
 	Sum=$((Nr1-Nr2))
+	return $Sum
 }
 
 div()
 {
 	Sum=$((Nr1/Nr2))
+	return $Sum
 }
 
 tim()
 {
-	Sum=$((Nr*Nr2))
+	Sum=$((Nr1*Nr2))
+	return $Sum
 }
 
 
 # Main
+Calc=`basename $0`
+echo $Calc
+
+case "$Calc" in
+	"add.sh")
+		add
+		echo $?
+		;;
+	"sub.sh")
+		sub
+		echo $?
+		;;
+	"div.sh")
+		div
+		echo $?
+		;;
+	"tim.sh")
+		tim
+		echo $?
+		;;
+	*)
+		echo "Please use on the symlink add.sh/sub.sh/div.sh/tim.sh"
+		exit 2
+		;;
+esac
+
+exit 0

Labb6/ovning4/div.sh

@@ -0,0 +1 @@
+calc.sh

Labb6/ovning4/sub.sh

@@ -0,0 +1 @@
+calc.sh

Labb6/ovning4/tim.sh

@@ -0,0 +1 @@
+calc.sh