Changeset 540 for client/linuxmuster-client/trunk/share/helperfunctions.sh

Timestamp:

10/09/09 20:13:17 (3 years ago)

Author:

tschmitt

Message:

• Mountoptionen in pam_mount.conf.xml-Vorlage für Hardy und Intrepid angepasst: iocharset=utf8 ergänzt, rsize und wsize entfernt.
• Weitere auszuschließende Dateien in /etc/linuxmuster-client/profile.exclude ergänzt.
• Kleine Aufräumaktion in helperfunctions.sh.
• "exit 0" am Ende von /etc/gdm/PostLogin/Default ergänzt (ohne das bricht Hardy's gdm den Login-Vorgang ab).
• Obsolete Konfigurationsdatei hardy/templates/etc/security/pam_mount.conf entfernt.

File:

• client/linuxmuster-client/trunk/share/helperfunctions.sh (modified) (2 diffs)

client/linuxmuster-client/trunk/share/helperfunctions.sh

@@ -14 +14 @@
 # get user homedir
 get_userhome() {
-        userhomecache=/tmp/.home-$USER
+        local userhomecache=/tmp/.home-$USER
         if [ ! -s "$userhomecache" ]; then
                 getent passwd $USER | cut -f6 -d: > $userhomecache
@@ -25 +25 @@
 # checking if directory is empty, in that case it returns 0
 check_empty_dir() {
-  unset RET
+  local RET
   RET=$(ls -A1 $1 2>/dev/null | wc -l)
-  [ "$RET" = "0" ] && return 0
-  return 1
+  return $RET
 }