From 82c5af59e22e447c69599f73a088241aa0700f29 Mon Sep 17 00:00:00 2001
From: Philippe Dpt35 <philippe.dpt35@yahoo.fr>
Date: Fri, 26 Oct 2018 19:23:17 +0200
Subject: [PATCH] Diverses modifications du script principal
---
ptx2-3-vers-4.sh | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/ptx2-3-vers-4.sh b/ptx2-3-vers-4.sh
index 57ce095..008f51f 100755
--- a/ptx2-3-vers-4.sh
+++ b/ptx2-3-vers-4.sh
@@ -79,6 +79,10 @@ 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/01-mini/.config/libreoffice
+rm -rf /home/02-super/.config/libreoffice
+rm -rf /home/03-maxi/.config/libreoffice
+rm -rf /home/administrateur/.config/libreoffice
# Conversion des fichiers de configuration des handymenus
python handymenuMigration.py
@@ -90,14 +94,28 @@ tar xvf "$archive_clc" -C "/home/03-maxi"
tar xvf "$archive_clc" -C "/home/administrateur"
cp gspeech.png /usr/share/pixmaps/gspeech.png
+# Libreoffice des écoles
+if [ "$version" = "8 (jessie)" ]
+ then tar xvf "$lo_mini_D8" -C "/home/01-mini/.config"
+ 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"
+ 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"
+fi
+
# Harmonisation des paquets
sudo apt-get remove -y --purge handymenu-primtux2 handymenu-mini-primtux2 handymenu-maxi-primtux2 handymenu-super-primtux2 qalculate-gtk
apt-get install -y handymenu thunderbird thunderbird-l10n-fr gnome-calculator geany mothsart-wallpapers-primtux gspeech xfce4-notifyd gir1.2-gstreamer-1.0
-# Rétablissement des droits
+# Rétablissement de la propriété de chaque home
chown -R 01-mini:01-mini /home/01-mini
chown -R 02-super:02-super /home/02-super
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 administrateur:administrateur /home/01-mini/.config/xfce4
chown -R administrateur:administrateur /home/02-super/.config/lxpanel
@@ -125,17 +143,6 @@ chown administrateur:administrateur /home/03-maxi/.config/rox.sourceforge.net/RO
chmod -R 777 /home/02-super/abuledu-primtux/abuledu-aller
chmod -R 777 /home/03-maxi/abuledu-primtux/abuledu-aller
-# Configuration de libreoffice des écoles
-if [ "$version" = "8 (jessie)" ]
- then tar xvf "$lo_mini_D8" -C "/home/01-mini/.config"
- 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"
- 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"
-fi
chmod -R -w /home/{01-mini,02-super,03-maxi,administrateur}/"$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,administrateur}/"$chemin_toolbar"/textobjectbar.xml
--
GitLab