From 3dc2893e56c98a0a3aae1f6fa22fc1a518c2545c Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Wed, 6 Mar 2019 10:51:36 +0100
Subject: [PATCH] Integrate fix for #18 and #21

---
 create_cifs_mounts.sh | 20 ++++++++++++++------
 session.sh            |  6 ++++--
 upgrade-session.sh    |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/create_cifs_mounts.sh b/create_cifs_mounts.sh
index 15b32a6..30eeae8 100755
--- a/create_cifs_mounts.sh
+++ b/create_cifs_mounts.sh
@@ -5,12 +5,19 @@ then
     apt-get -y install cifs-utils smbclient
 fi
 
+for d in /home/shares/*/*
+do
+    umount $d > /dev/null 2>&1 || umount $d/* > /dev/null 2>&1
+    rmdir $d/* > /dev/null 2>&1
+    rmdir $d > /dev/null 2>&1
+done
+
 # Remove all ^//ecole-dc lines in fstab
 sed -i.bak '/^\/\/ecole-dc/d' /etc/fstab
 
 declare -A LEVELS
-LEVELS=(['01-mini']='cp' ['02-super']='ce' ['03-maxi']='cm')
-CLASSES=(['01-mini']='01-cp' ['02-super']='02-ce1-ce2' ['03-maxi']='03-cm1-cm2')
+LEVELS=(['01-mini']='CP' ['02-super']='CE' ['03-maxi']='CM')
+CLASSES=(['01-mini']='01-CP' ['02-super']='02-CE1-CE2' ['03-maxi']='03-CM1-CM2')
 
 # Students
 for usr in 01-mini 02-super 03-maxi
@@ -19,22 +26,23 @@ do
     mkdir -p /home/shares/$usr/PROFESSEURS
     chown -R $usr:$usr /home/shares/$usr
     lvl=${LEVELS[$usr]}
-    if [ $lvl != 'cp' ]
+    if [ $lvl != 'CP' ]
     then
         lvl2="${lvl}1-${lvl}2"
     else
         lvl2=$lvl
     fi
+    lvlcred=$(echo "$lvl" | awk '{print tolower($0)}')
     cat <<EOF>>/etc/fstab
-//ecole-dc/$lvl2/donnees /home/shares/$usr/PROFESSEURS/ cifs _netdev,users,noauto,credentials=/etc/cifs/secrets/$lvl,uid=$usr,gid=$usr 0 0
-//ecole-dc/$lvl2/travail /home/shares/$usr/ELEVES/ cifs _netdev,users,noauto,credentials=/etc/cifs/secrets/$lvl,uid=$usr,gid=$usr 0 0
+//ecole-dc/$lvl2/donnees /home/shares/$usr/PROFESSEURS/ cifs _netdev,users,noauto,credentials=/etc/cifs/secrets/$lvlcred,uid=$usr,gid=$usr 0 0
+//ecole-dc/$lvl2/travail /home/shares/$usr/ELEVES/ cifs _netdev,users,noauto,credentials=/etc/cifs/secrets/$lvlcred,uid=$usr,gid=$usr 0 0
 EOF
 done
 # profs
 for usr in prof direction
 do
     mkdir -p /home/shares/$usr/SCAN
-    for classe in 01-cp 02-ce1-ce2 03-cm1-cm2
+    for classe in 01-CP 02-CE1-CE2 03-CM1-CM2
     do
         mkdir -p /home/shares/$usr/$classe/PROFESSEURS
         mkdir -p /home/shares/$usr/$classe/ELEVES
diff --git a/session.sh b/session.sh
index d5bd3bf..fdac167 100755
--- a/session.sh
+++ b/session.sh
@@ -13,7 +13,9 @@ do
     rm $HOME/Documents/$d/{ELEVES,PROFESSEURS} > /dev/null 2>&1
     rmdir $HOME/Documents/$d > /dev/null 2>&1
 done
-rm $HOME/Documents/SCAN $HOME/Documents/CONFIDENTIEL > /dev/null 2>&1
+rm $HOME/Documents/SCAN $HOME/Documents/CONFIDENTIEL \
+    $HOME/Documents/CONFIDENTIEL_DIRECTION \
+    $HOME/Documents/CONFIDENTIEL_PROFESSEURS > /dev/null 2>&1
 
 mkdir -p $HOME/.config/gtk-3.0
 
@@ -65,4 +67,4 @@ case "$USER" in
 		echo file://$DOCUMENTS/CONFIDENTIEL_DIRECTION CONFIDENTIEL_DIRECTION >> $HOME/.config/gtk-3.0/bookmarks
 		echo file://$DOCUMENTS/CONFIDENTIEL_PROFESSEURS CONFIDENTIEL_PROFESSEURS >> $HOME/.config/gtk-3.0/bookmarks
 		;;
-esac
\ No newline at end of file
+esac
diff --git a/upgrade-session.sh b/upgrade-session.sh
index 64d7239..2b2e5f7 100755
--- a/upgrade-session.sh
+++ b/upgrade-session.sh
@@ -34,6 +34,7 @@ $DIR/create_cifs_mounts.sh
 $DIR/set_mime_apps.sh
 $DIR/set_screens.sh
 $DIR/install_print_drivers.sh
+$DIR/fix_libreoffice.sh
 $DIR/install_vnc.sh
 
 # Install missing libreoffice gtk
-- 
GitLab