From feb9b2e1043fb4c1aea53d575405ab0028d90d2b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 3 Apr 2020 22:07:51 +0200 Subject: etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox: Fix script when running on Debian Edu bullseye. --- ...0-itzks-systems-roamingworkstation_prep-firefox | 40 +++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox index f779883..2af6555 100755 --- a/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox +++ b/etc/mklocaluser.d/60-itzks-systems-roamingworkstation_prep-firefox @@ -5,19 +5,35 @@ set -e GROUP=$(id -g "$USER") HOMEDIR="/home/$USER" -mkdir -p "$HOMEDIR/.mozilla/firefox/debian-edu.default" -if [ ! -e "$HOMEDIR/.mozilla/firefox/profiles.ini" ]; then - cp "/usr/share/debian-edu-config/profiles.ini.ff" "$HOMEDIR/.mozilla/firefox/profiles.ini" +# this is maily for Debian buster or rather Firefox versions that don't support +# the policies.json file + +if [ -e "/usr/share/debian-edu-config/profiles.ini.ff" ]; then + mkdir -p "$HOMEDIR/.mozilla/firefox/debian-edu.default" + if [ ! -e "$HOMEDIR/.mozilla/firefox/profiles.ini" ]; then + cp "/usr/share/debian-edu-config/profiles.ini.ff" "$HOMEDIR/.mozilla/firefox/profiles.ini" + fi +fi + +if [ -e "/usr/share/debian-edu-config/installs.ini" ]; then + if [ ! -e "$HOMEDIR/.mozilla/firefox/installs.ini" ]; then + cp "/usr/share/debian-edu-config/installs.ini" "$HOMEDIR/.mozilla/firefox/installs.ini" + fi fi -if [ ! -e "$HOMEDIR/.mozilla/firefox/installs.ini" ]; then - cp "/usr/share/debian-edu-config/installs.ini" "$HOMEDIR/.mozilla/firefox/installs.ini" + +if [ -d "$HOMEDIR/.mozilla"]; then + chmod -R u+w,go-rwx "$HOMEDIR/.mozilla/" + chown -R $USER:$GROUP "$HOMEDIR/.mozilla/" +fi + +if [ -e "/usr/share/debian-edu-config/profiles.ini" ]; then + mkdir -p "$HOMEDIR/.thunderbird/debian-edu.default" + if [ ! -e "$HOMEDIR/.thunderbird/profiles.ini" ]; then + cp "/usr/share/debian-edu-config/profiles.ini" "$HOMEDIR/.thunderbird/profiles.ini" + fi fi -chmod -R u+w,go-rwx "$HOMEDIR/.mozilla/" -chown -R $USER:$GROUP "$HOMEDIR/.mozilla/" -mkdir -p "$HOMEDIR/.thunderbird/debian-edu.default" -if [ ! -e "$HOMEDIR/.thunderbird/profiles.ini" ]; then - cp "/usr/share/debian-edu-config/profiles.ini" "$HOMEDIR/.thunderbird/profiles.ini" +if [ -d "$HOMEDIR/.thunderbird"]; then + chmod -R u+w,go-rwx "$HOMEDIR/.thunderbird/" + chown -R $USER:$GROUP "$HOMEDIR/.thunderbird/" fi -chmod -R u+w,go-rwx "$HOMEDIR/.thunderbird/" -chown -R $USER:$GROUP "$HOMEDIR/.thunderbird/" -- cgit v1.2.3