small bug fixes

1 files changed, 11 insertions, 20 deletions

diff --git a/tools/install_14_04_3.sh b/tools/install_14_04_3.sh
index 084248a..bf5ed20 100755
--- a/tools/install_14_04_3.sh
+++ b/tools/install_14_04_3.sh
@@ -34,12 +34,8 @@ fi
 # echo "#!/bin/bash" >/usr/bin/update-notifier
 # find /usr/lib -name notify-osd | xargs chmod -x
 # killall notify-osd 2>/dev/null
-gconftool -s -t bool /apps/update-notifier/auto_launch false
-if [ -f /usr/share/dbus-1/services/org.freedesktop.Notifications.service ]; then
-  mv /usr/share/dbus-1/services/org.freedesktop.Notifications.service /usr/share/dbus-1/services/org.freedesktop.Notifications.service.disabled
-fi
-
 apt-get -y install python-software-properties 2>/dev/null
+gconftool -s -t bool /apps/update-notifier/auto_launch false
 
 for i in id chown chmod cut awk tail grep cat sed mkdir rm mv sleep apt-get add-apt-repository update-alternatives; do
   p=`which $i`
@@ -122,7 +118,7 @@ apt-get -y install zenity apache2 eclipse-pde eclipse-rcp eclipse-platform eclip
   php5 php5-pgsql postgresql postgresql-client postgresql-contrib quota sharutils default-jdk openjdk-7-doc \
   vim-gnome geany geany-plugin-addons geany-plugins geany-plugin-debugger default-jre sysstat \
   vim xfce4 $libCppdev $libCppdoc $libCppdbg php5-gd stl-manual gcc-doc debootstrap schroot c++-annotations \
-  sublime-text-installer
+  sublime-text-installer libgnomekbd-common
 if [ $? != 0 ]; then
   echo ""
   echo "ERROR running the apt-get -- must check if all needed packages are available"
@@ -191,18 +187,13 @@ else
  echo "user icpc already exists"
 fi
 
-if [ -d /etc/lightdm ]; then
+lightdmfile=/etc/lightdm/lightdm.conf
+if [ -d "`dirname $lightdmfile`" ]; then
   echo "=============================================================="
-  echo "====== disabling guest account on lightdm.conf  ========"
+  echo "====== disabling guest account on lightdm  ========"
   echo "=============================================================="
-  [ -f /etc/lightdm/lightdm.conf ] && grep -q "^[^\#]*allow-guest" /etc/lightdm/lightdm.conf
-  if [ $? != 0 ]; then
-    echo "allow-guest=false" >> /etc/lightdm/lightdm.conf
-  fi
-  [ -f /etc/lightdm/lightdm.conf ] && grep -q "^[^\#]*greeter-hide-users" /etc/lightdm/lightdm.conf
-  if [ $? != 0 ]; then
-    echo "greeter-hide-users=true" >> /etc/lightdm/lightdm.conf
-  fi
+  echo -e "[SeatDefaults]\n" > $lightdmfile
+  echo -e "allow-guest=false\ngreeter-hide-users=true\ngreeter-show-remote-login=false\ngreeter-show-manual-login=true\n" >> $lightdmfile
 fi
 
 # echo "====================================================================================="
@@ -315,7 +306,7 @@ echo "=============================================================="
 echo "================= UPDATING rc.local symlinks   ==============="
 echo "=============================================================="
 
-update-rc.d rc.local defaults
+#update-rc.d rc.local defaults
 update-rc.d -f cups remove
 apt-get -y clean
 
@@ -326,11 +317,11 @@ apt-get -y clean
 #/etc/icpc/setup.sh
 
 startscript="NOTOK"
-if [ -d /etc/lightdm ]; then
+if [ -d "`dirname $lightdmfile`" ]; then
   startscript="OK"
-  [ -f /etc/lightdm/lightdm.conf ] && grep -q "^[^\#]*display-setup-script=/etc/icpc/setup.sh" /etc/lightdm/lightdm.conf
+  [ -f $lightdmfile ] && grep -q "^[^\#]*greeter-setup-script=/etc/icpc/setup.sh" $lightdmfile
   if [ $? != 0 ]; then
-    echo "display-setup-script=/etc/icpc/setup.sh" >> /etc/lightdm/lightdm.conf
+    echo "greeter-setup-script=/etc/icpc/setup.sh" >> $lightdmfile
   fi
 fi
 if [ -d /etc/gdm/Init ]; then