From 0901959d6296af9d04df2d668e1e7f31ccbcf00c Mon Sep 17 00:00:00 2001
From: Andreas Fendt <andreasfendt@gmx.net>
Date: Fri, 5 Sep 2014 21:47:00 +0200
Subject: [PATCH] some corrections

Signed-off-by: Andreas Fendt <andreasfendt@gmx.net>
---
 install-debian.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/install-debian.sh b/install-debian.sh
index 9009717..80d3ba4 100755
--- a/install-debian.sh
+++ b/install-debian.sh
@@ -11,8 +11,6 @@ function update-upgrade {
 }
 
 function common {
-  # configure system
-  apt-get install -y console-data keyboard-configuration manpages-de
   # default shell
   apt-get install -y sudo tmux mc tree pv vim mosh
   # shell
@@ -24,13 +22,18 @@ function common {
   cp /etc/zsh/newuser.zshrc.recommended /root/.zshrc
   # diagnostics
   apt-get install -y htop iotop iftop nmon powertop stress lm-sensors
-  sensors-detect
   # versioning
   apt-get install -y git git-gui subversion libapache2-svn 
   # networking
   apt-get install -y nfs-common cifs-utils aircrack-ng openvpn
 }
 
+function common-end {
+  # configure system
+  apt-get install -y console-data keyboard-configuration manpages-de
+  sensors-detect
+}
+
 function client-gui {
   # programs
   apt-get install -y firefox firefox-locale-de thunderbird thunderbird-locale-de \
@@ -39,11 +42,14 @@ function client-gui {
   apt-get install -y eclipse
   # OpenJDK
   apt-get install -y openjdk-6-jdk openjdk-6-source openjdk-6-demo openjdk-6-doc \
-		    openjdk-6-jre-headless openjdk-6-jre-lib
+		     openjdk-6-jre-headless openjdk-6-jre-lib
   apt-get install -y openjdk-7-jdk openjdk-7-source openjdk-7-demo openjdk-7-doc \
-		    openjdk-7-jre-headless openjdk-7-jre-lib
+		     openjdk-7-jre-headless openjdk-7-jre-lib
   # Oracle Java
   apt-get install -y oracle-java7-installer oracle-java8-installer
+}
+
+function client-gui-end {
   # Java Plugin
   update-alternatives --config mozilla-javaplugin.so
 }
@@ -76,6 +82,8 @@ do
             update-upgrade
             common
             client-gui
+            common-end
+            client-gui-end
             break
             ;;
         "server-cli")
@@ -83,6 +91,7 @@ do
             update-upgrade
             common
             server-cli
+            common-end
             break
             ;;
         "server-gui")
@@ -90,6 +99,7 @@ do
             update-upgrade
             common
             server-gui
+            common-end
             break
             ;;
         *) echo invalid option;;