diff --git a/handymenuMigration.py b/handymenuMigration.py
index 4b0048f01f199afab15bb5a4d39bba33691d497c..9ada48c346fcde2c5efaef4b246a88b76ec0a09e 100755
--- a/handymenuMigration.py
+++ b/handymenuMigration.py
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# -*- coding:Utf-8 -*-
+# -*- coding:Utf-8 -*-
import sys
import os
@@ -93,7 +93,7 @@ def convert_config(in_path, out_path, skel_path=None, verbose=False):
if __name__ == "__main__":
verbose = False
if (
- len(sys.argv) > 1
+ len(sys.argv) > 1
and (sys.argv[1] == "-v" or sys.argv[1] == "--verbose")
):
verbose = True
@@ -101,10 +101,10 @@ if __name__ == "__main__":
"Etape 1 : Migration des sessions mini, super, maxi et prof",
True
)
- sessions = ['01-mini', '02-super', '03-maxi', 'administrateur']
+ sessions = ['01-mini', '02-super', '03-maxi', 'administrateur', 'direction', 'prof']
for session in sessions:
- skel_session = session.replace('01', '').replace('02', '').replace('03', '').replace('administrateur', '')
- if session == 'administrateur':
+ skel_session = session.replace('01', '').replace('02', '').replace('03', '').replace('administrateur', '').replace('prof', '').replace('direction', '')
+ if session == 'administrateur' or session == 'direction':
session = 'prof'
convert_config(
"/home/" + session + "/handymenu.conf",
@@ -115,8 +115,8 @@ if __name__ == "__main__":
coloring("Etape 2 : Migration des comptes personnalisés", True)
custom_sessions = list(
- set(os.listdir("/home/"))
- - set(sessions)
+ set(os.listdir("/home/"))
+ - set(sessions)
- set(['lost+found'])
)
for custom_session in custom_sessions:
diff --git a/ptx2-3-vers-4.sh b/ptx2-3-vers-4.sh
index fa350b89ab7e126d0ebdd59cdffea0ed2b76477b..89c5ba3ee4add256fdeaa7859b4035f34791d0dc 100755
--- a/ptx2-3-vers-4.sh
+++ b/ptx2-3-vers-4.sh
@@ -74,16 +74,22 @@ fi
# Nettoyage des fichiers de configuration obsolètes
rm /home/administrateur/.config/xfce4/panel/launcher-8/15250977438.desktop
+rm /home/direction/.config/xfce4/panel/launcher-8/15250977438.desktop
+rm /home/prof/.config/xfce4/panel/launcher-8/15250977438.desktop
rm /home/03-maxi/.config/xfce4/panel/launcher-15/14502846451.desktop
rm /home/02-super/.config/xfce4/panel/launcher-15/14502846451.desktop
rm -rf /home/01-mini/.local/share/applications/*
rm -rf /home/02-super/.local/share/applications/*
rm -rf /home/03-maxi/.local/share/applications/*
rm -rf /home/administrateur/.local/share/applications/*
+rm -rf /home/direction/.local/share/applications/*
+rm -rf /home/prof/.local/share/applications/*
rm -rf /home/01-mini/.config/libreoffice
rm -rf /home/02-super/.config/libreoffice
rm -rf /home/03-maxi/.config/libreoffice
rm -rf /home/administrateur/.config/libreoffice
+rm -rf /home/direction/.config/libreoffice
+rm -rf /home/prof/.config/libreoffice
# Conversion des fichiers de configuration des handymenus
python handymenuMigration.py
@@ -93,6 +99,8 @@ tar xvf "$archive" -C "/"
tar xvf "$archive_clc" -C "/home/02-super"
tar xvf "$archive_clc" -C "/home/03-maxi"
tar xvf "$archive_clc" -C "/home/administrateur"
+tar xvf "$archive_clc" -C "/home/direction"
+tar xvf "$archive_clc" -C "/home/prof"
tar xvf "$themes" -C "/usr/share/fluxbox/styles"
cp gspeech.png /usr/share/pixmaps/gspeech.png
@@ -102,10 +110,14 @@ if [ "$version" = "8 (jessie)" ]
tar xvf "$lo_super_D8" -C "/home/02-super/.config"
tar xvf "$lo_maxi_D8" -C "/home/03-maxi/.config"
tar xvf "$lo_admin_D8" -C "/home/administrateur/.config"
+ tar xvf "$lo_admin_D8" -C "/home/direction/.config"
+ tar xvf "$lo_admin_D8" -C "/home/prof/.config"
else tar xvf "$lo_mini" -C "/home/01-mini/.config"
tar xvf "$lo_super" -C "/home/02-super/.config"
tar xvf "$lo_maxi" -C "/home/03-maxi/.config"
tar xvf "$lo_admin" -C "/home/administrateur/.config"
+ tar xvf "$lo_admin" -C "/home/direction/.config"
+ tar xvf "$lo_admin" -C "/home/prof/.config"
fi
# Harmonisation des paquets
@@ -119,35 +131,89 @@ chown -R 03-maxi:03-maxi /home/03-maxi
# On protège certains fichiers
chown -R administrateur:administrateur /home/01-mini/.config/lxpanel
+chown -R direction:direction /home/01-mini/.config/lxpanel
+chown -R prof:prof /home/01-mini/.config/lxpanel
chown -R administrateur:administrateur /home/01-mini/.config/xfce4
+chown -R direction:direction /home/01-mini/.config/xfce4
+chown -R prof:prof /home/01-mini/.config/xfce4
chown -R administrateur:administrateur /home/02-super/.config/lxpanel
+chown -R direction:direction /home/02-super/.config/lxpanel
+chown -R prof:prof /home/02-super/.config/lxpanel
chown -R administrateur:administrateur /home/02-super/.config/xfce4
+chown -R direction:direction /home/02-super/.config/xfce4
+chown -R prof:prof /home/02-super/.config/xfce4
chown -R administrateur:administrateur /home/03-maxi/.config/lxpanel
+chown -R direction:direction /home/03-maxi/.config/lxpanel
+chown -R prof:prof /home/03-maxi/.config/lxpanel
chown -R administrateur:administrateur /home/03-maxi/.config/xfce4
+chown -R direction:direction /home/03-maxi/.config/xfce4
+chown -R prof:prof /home/03-maxi/.config/xfce4
chown -R administrateur:administrateur /home/01-mini/.config/libfm
+chown -R direction:direction /home/01-mini/.config/libfm
+chown -R prof:prof /home/01-mini/.config/libfm
chown -R administrateur:administrateur /home/02-super/.config/libfm
+chown -R direction:direction /home/02-super/.config/libfm
+chown -R prof:prof /home/02-super/.config/libfm
chown -R administrateur:administrateur /home/03-maxi/.config/libfm
+chown -R direction:direction /home/03-maxi/.config/libfm
+chown -R prof:prof /home/03-maxi/.config/libfm
chown -R administrateur:administrateur /home/01-mini/.fluxbox/startup
+chown -R direction:direction /home/01-mini/.fluxbox/startup
+chown -R prof:prof /home/01-mini/.fluxbox/startup
chown -R administrateur:administrateur /home/02-super/.fluxbox/startup
+chown -R direction:direction /home/02-super/.fluxbox/startup
+chown -R prof:prof /home/02-super/.fluxbox/startup
chown -R administrateur:administrateur /home/03-maxi/.fluxbox/startup
+chown -R direction:direction /home/03-maxi/.fluxbox/startup
+chown -R prof:prof /home/03-maxi/.fluxbox/startup
chown administrateur:administrateur /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/Options
+chown direction:direction /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/Options
+chown prof:prof /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/Options
chown administrateur:administrateur /home/02-super/.config/rox.sourceforge.net/ROX-Filer/Options
+chown direction:direction /home/02-super/.config/rox.sourceforge.net/ROX-Filer/Options
+chown prof:prof /home/02-super/.config/rox.sourceforge.net/ROX-Filer/Options
chown administrateur:administrateur /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/Options
+chown direction:direction /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/Options
+chown prof:prof /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/Options
chown administrateur:administrateur /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/globicons
+chown direction:direction /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/globicons
+chown prof:prof /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/globicons
chown administrateur:administrateur /home/02-super/.config/rox.sourceforge.net/ROX-Filer/globicons
+chown direction:direction /home/02-super/.config/rox.sourceforge.net/ROX-Filer/globicons
+chown prof:prof /home/02-super/.config/rox.sourceforge.net/ROX-Filer/globicons
chown administrateur:administrateur /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/globicons
+chown direction:direction /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/globicons
+chown prof:prof /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/globicons
chown administrateur:administrateur /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/menus2
+chown direction:direction /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/menus2
+chown prof:prof /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/menus2
chown administrateur:administrateur /home/02-super/.config/rox.sourceforge.net/ROX-Filer/menus2
+chown direction:direction /home/02-super/.config/rox.sourceforge.net/ROX-Filer/menus2
+chown prof:prof /home/02-super/.config/rox.sourceforge.net/ROX-Filer/menus2
chown administrateur:administrateur /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/menus2
+chown direction:direction /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/menus2
+chown prof:prof /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/menus2
chown administrateur:administrateur /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/panels
+chown direction:direction /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/panels
+chown prof:prof /home/01-mini/.config/rox.sourceforge.net/ROX-Filer/panels
chown administrateur:administrateur /home/02-super/.config/rox.sourceforge.net/ROX-Filer/panels
+chown direction:direction /home/02-super/.config/rox.sourceforge.net/ROX-Filer/panels
+chown prof:prof /home/02-super/.config/rox.sourceforge.net/ROX-Filer/panels
chown administrateur:administrateur /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/panels
+chown direction:direction /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/panels
+chown prof:prof /home/03-maxi/.config/rox.sourceforge.net/ROX-Filer/panels
chmod -R 777 /home/02-super/abuledu-primtux/abuledu-aller
chmod -R 777 /home/03-maxi/abuledu-primtux/abuledu-aller
chmod -R -w /home/{01-mini,02-super,03-maxi,administrateur}/"$chemin_toolbar"
+chmod -R -w /home/{01-mini,02-super,03-maxi,direction}/"$chemin_toolbar"
+chmod -R -w /home/{01-mini,02-super,03-maxi,prof}/"$chemin_toolbar"
chmod +w /home/{01-mini,02-super,03-maxi,administrateur}/"$chemin_toolbar"/standardbar.xml
+chmod +w /home/{01-mini,02-super,03-maxi,direction}/"$chemin_toolbar"/standardbar.xml
+chmod +w /home/{01-mini,02-super,03-maxi,prof}/"$chemin_toolbar"/standardbar.xml
chmod +w /home/{01-mini,02-super,03-maxi,administrateur}/"$chemin_toolbar"/textobjectbar.xml
+chmod +w /home/{01-mini,02-super,03-maxi,direction}/"$chemin_toolbar"/textobjectbar.xml
+chmod +w /home/{01-mini,02-super,03-maxi,prof}/"$chemin_toolbar"/textobjectbar.xml
# Indication de version PrimTux
if ! [ -e "/etc/primtux_version" ]