update etersoft tune_new_user

etersoft/tune_new_user.sh

@@ -6,16 +6,18 @@ CONSOLEFONT="Droid Sans Mono 11"
 #NU="$1"
 NU="$USER"
 DOMAIN="etersoft.ru"
-
+CONSOLEFONT="Droid Sans Mono 11"
 [ -n "$NU" ] || exit
 
 # skip for these users
 case "$NU" in
     lav|kondratyuk)
-        exit
+        exit 1
         ;;
 esac
 
+[ "$UID" = 0 ] && exit 1
+
 NAME="$(getent passwd "$NU" | cut -d":" -f5)"
 [ -n "$NAME" ] || exit
 
@@ -55,6 +57,7 @@ fi
 # tune terminal
 mkdir -p ~/.config/xfce4/terminal/
 cat <<EOF >>~/.config/xfce4/terminal/accels.scm
+; Etersoft
 ; xfce4-terminal GtkAccelMap rc-file         -*- scheme -*-
 ; this file is an automated accelerator map dump
 ;
@@ -117,6 +120,7 @@ EOF
 
 mkdir -p ~/.config/xfce4/terminal/
 cat <<EOF >>~/.config/xfce4/terminal/terminalrc
+# Etersoft
 [Configuration]
 FontName=$CONSOLEFONT
 MiscAlwaysShowTabs=FALSE
@@ -161,6 +165,7 @@ EOF
 
 mkdir -p ~/.config/xfce4/terminal/
 cat <<EOF >>~/.config/xfce4/helpers.rc
+# Etersoft
 TerminalEmulator=xfce4-terminal
 WebBrowser=chromium
 FileManager=Thunar
@@ -169,6 +174,7 @@ EOF
 
 mkdir -p ~/.config/mc/
 cat <<EOF >>~/.config/mc/ini
+# Etersoft
 [Midnight-Commander]
 verbose=true
 shell_patterns=true
@@ -317,10 +323,9 @@ Modified git files=git ls-files --modified
 EOF
 
 FIREFOXPREFS=$(echo ~/.mozilla/firefox/*/prefs.js)
-if [ -s "$FIREFOXPREFS" ] ; then
-    if ! grep "network.negotiate-auth.trusted-uris" $FIREFOXPREFS ; then
-        echo 'user_pref("network.negotiate-auth.trusted-uris", ".etersoft.ru,.eterhost.ru");' >>$FIREFOXPREFS
+for i in $FIREFOXPREFS ; then
+    [ -s "$i" ] || continue
+    if ! grep "network.negotiate-auth.trusted-uris" $i ; then
+        echo 'user_pref("network.negotiate-auth.trusted-uris", ".etersoft.ru,.eterhost.ru");' >>$i
     fi
-fi
-
-
+done

etersoft/tune_new_user_su.sh

@@ -5,7 +5,9 @@ NU="$1"
 
 if [ ! -d "/srv/$NU/Projects" ] ; then
     mkdir -p /srv/$NU/Projects || exit
-    ln -s /srv/$NU/ /home/$NU/Projects
+    chown -Rv $NU:builder /srv/$NU
+    [ -L /home/$NU/Projects ] && rm -f /home/$NU/Projects
+    ln -s /srv/$NU/Projects /home/$NU/Projects
 
     # hektor: /home
     if [ "hektor" = "$(hostname -s)" ] ; then