Changeset 1013

Timestamp:

03/13/11 18:59:28 (14 months ago)

Author:

fsch

Message:

Backup

Location:

client/linuxmuster-client/branches/luh_branch

Files:

• debian/changelog (modified) (2 diffs)
• lucid/templates/etc/linuxmuster-client/mount.d/05_firefox.sh (modified) (1 diff)
• share/tools/lmc-firstconfigure.sh (moved) (moved from client/linuxmuster-client/branches/luh_branch/share/tools/client-firstconfigure.sh) (3 diffs)
• share/tools/lmc-setup-pykoticon.sh (moved) (moved from client/linuxmuster-client/branches/luh_branch/share/tools/setup-pykoticon.sh) (1 diff)

client/linuxmuster-client/branches/luh_branch/debian/changelog

@@ -1 @@
-linuxmuster-client (0.9.20-21) testing; urgency=low
+linuxmuster-client (0.9.20-22) testing; urgency=low
 
    * First package with local userhome
@@ -14 +14 @@
    * Added tools directory to share, skripts for setting up pykota an do a
      first run over sane settings for the default user
+   * pykoticon setup tool creates autostart file for gnome
 
  -- Frank Schiebel <frank@linuxmuster.net>  Sat, 12 Mar 2011 19:25:00 +0100

client/linuxmuster-client/branches/luh_branch/lucid/templates/etc/linuxmuster-client/mount.d/05_firefox.sh

@@ -26 +26 @@
 
 # create it if it was not copied
-[ -d $HOME/$APPS_BASEDIR/$FIREFOX_PROFILE ] || mkdir $HOME/$APPS_BASEDIR/$FIREFOX_PROFILE
+[ -d $HOME/$APPS_BASEDIR/$FIREFOX_PROFILE ] || mkdir -p $HOME/$APPS_BASEDIR/$FIREFOX_PROFILE
 
 fi

client/linuxmuster-client/branches/luh_branch/share/tools/lmc-firstconfigure.sh

@@ -4 +4 @@
 . /etc/linuxmuster-client/config
 
-if [ "x$TEMPLATE_USER" == "x" ];
+if [ "x$TEMPLATE_USER" == "x" ]; then
     echo "Kein Templatebenutzer gefunden, ist linuxmuster-client korrekt eingerichtet?"
     exit 1
@@ -12 +12 @@
 if [ -f /etc/xdg/autostart/update-notifier.desktop ]; then
     rm -f /etc/xdg/autostart/update-notifier.desktop
-    echo "Deaktiviere automatishe Updatechecks"
-    echo "      Lösche /etc/xdg/autostart/update-notifier.desktop"
-    echo "erledigt."
-    echo
-else
-    echo "Automatische Updatechecks sind bereits deaktiviert"
 fi
-
-
 # Benutzerliste in gdm deaktivieren
 sudo -u gdm gconftool-2 -t bool -s /apps/gdm/simple-greeter/disable_user_list true
@@ -32 +24 @@
 # Benutzeranzeige entfernen
 dpkg --remove indicator-me > /dev/null 2>&1
+# Abmelden Starter auf den Desktop des Vorlagenbenutzers
+(
+cat << EOF
+#!/usr/bin/env xdg-open
 
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Icon[de_DE]=/usr/share/icons/Humanity/apps/48/gnome-session-halt.svg
+Name[de_DE]=Abmelden
+Exec=gnome-session-save --logout
+Comment[de_DE]=Abmelden
+Name=Abmelden
+Comment=Abmelden
+Icon=/usr/share/icons/Humanity/apps/48/gnome-session-halt.svg
+EOF
+) > /home/linuxadmin/Desktop/Abmelden.desktop
+

client/linuxmuster-client/branches/luh_branch/share/tools/lmc-setup-pykoticon.sh

@@ -5 +5 @@
 # Frank Schiebel
 #
+# Install wxgtk as a dep
+apt-get install python-wxgtk2.6
+# change to source dir
+cd /usr/share/linuxmuster-client/pykoticon-1.02/
+# install package
+python setup.py install
+# link icon dirs correctly
+if [ -L /usr/share/pykoticon ]; then
+    rm /usr/share/pykoticon
+fi
+ln -s /usr/local/share/pykoticon/ /usr/share/pykoticon
+cd
 
 
+SERVERIP=`grep uri /etc/ldap.conf | grep -v ^# | awk -F"//" '{print $2}' | awk -F"/" '{print $1}'`
+
+(
+cat << EOF
+[Desktop Entry]
+Type=Application
+Name=PykotIcon Print-Quota notifier
+Exec=/usr/local/bin/pykoticon $SERVERIP
+Comment=Show messages from pykota
+Icon=folder-remote
+Terminal=false
+Categories=
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Delay=10
+EOF
+) > /etc/xdg/autostart/pykoticon.desktop