Several Bug fix

+ Fix bad Links
+ Fix handymenu broken
+ Fix bad handymenu configuration files
+ ADD: One groupe per level

create_primtux_user.sh

@@ -7,6 +7,13 @@ SKELS[cycle_3]="03-maxi"
 SKELS[professeur]="prof"
 SKELS[direction]="direction"
 
+declare -A GRPS
+GRPS[cycle_1]="Cycle1"
+GRPS[cycle_2]="Cycle2"
+GRPS[cycle_3]="Cycle3"
+GRPS[professeur]="Profs"
+GRPS[direction]="Administratifs"
+
 user="$1"
 level="$2"
 TEMPF="$$_temp"
@@ -64,6 +71,8 @@ fi
 # Add Primtux to user group
 echo -e "dn: cn=Primtux,ou=Groups,$LDAP_BASE_DN\nchangetype: modify\nadd: memberUid\nmemberUid: $user" > $TEMPF.1.ldiff
 ldapmodify -x -D "cn=$LDAP_ADMIN_RDN,$LDAP_BASE_DN" -w $LDAP_ADMIN_PW -f $TEMPF.1.ldiff
+echo -e "dn: cn=${GRPS[$level]},ou=Groups,$LDAP_BASE_DN\nchangetype: modify\nadd: memberUid\nmemberUid: $user" > $TEMPF.1.ldiff
+ldapmodify -x -D "cn=$LDAP_ADMIN_RDN,$LDAP_BASE_DN" -w $LDAP_ADMIN_PW -f $TEMPF.1.ldiff
 # Retrieve files from skels
 skel="$DIR/skels/${SKELS[$level]}"
 home=`grep home $TEMPF.ldiff | cut -d ' ' -f 2`
@@ -72,12 +81,12 @@ cp -r $skel $home
 cp -r $home.bak/* $home/
 rm -rf $home.bak
 # fix links
-if [ -e "$home/.wine/drive_c/users/01-mini/Bureau" ]
-then
-    ln -sf $home/Bureau $home/.wine/drive_c/users/01-mini/Bureau 
-fi
+find $home/.wine/drive_c/ -type l ! -exec test -e {} \; -print | while read f
+do
+    ln -sf "$home/`basename \"$f\" | sed 's/.* \(.*\)/\u\1/'`" "$f"
+done
+sed -i s@${SKELS[$level]}@$user@g $home/.config/xfce4/panel/launcher-4/14504679941.desktop
 # fix samba passwd
-# TODO: test me
 echo "You will  be prompted twice for samba password, please enter the same as for LDAP"
 smbpasswd -U $user
 # fix Rights

deploy.sh

@@ -4,7 +4,4 @@ then
     echo "This script should be run on the LCS"
     exit 1
 fi
-# Create basic users 1 per cycle + prof + direction
-## Homedirs
-## LDIF
-## ldapadd
+DIR=`dirname $0`

dist/primtux.ldiff

-dn: cn=Primtux,ou=Groups,ou=DSIT,BASE
+dn: cn=Cycle1,ou=Groups,BASE
+gidNumber: 5007
+description: Utilisateurs du Cycle 1
+objectClass: posixGroup
+objectClass: top
+cn: Cycle1
+
+dn: cn=Cycle2,ou=Groups,BASE
+gidNumber: 5008
+description: Utilisateurs du Cycle 2
+objectClass: posixGroup
+objectClass: top
+cn: Cycle2
+
+dn: cn=Cycle3,ou=Groups,BASE
+gidNumber: 5009
+description: Utilisateurs du Cycle 3
+objectClass: posixGroup
+objectClass: top
+cn: Cycle3
+
+dn: cn=Primtux,ou=Groups,BASE
 gidNumber: 5006
 description: Utilisateurs visibles sur Primtux
 objectClass: posixGroup