Suppress "warning: setlocale: LC_CTYPE: cannot change locale (...)"

[ConfigScripts.git] / install.sh

diff --git a/install.sh b/install.sh
index 86849bb582b9ce59c4910ffab28177601f787e14..877058beb19d507b8763729c5063d86afbcb9a23 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -37,7 +37,7 @@ Copy_File() {
 }
 
 Config_System() {
-       if [ "$UID" = "0" ]; then
+       if [ "$UID" = "0" -a -z "$I_local" ]; then
                Msg "Starting system configuration:\n"
                Msg " - bash shell:\n"
                if [ -e /etc/bash.bashrc ]; then
@@ -49,7 +49,7 @@ Config_System() {
        else
                Msg "Not running with root privileges - system configuration SKIPPED.\n"
                grep "alex@barton.de" /etc/profile >/dev/null 2>&1
-               if [ $? -ne 0 ]; then
+               if [ $? -ne 0 -o -n "$I_local" ]; then
                        Msg "Installing system files to $HOME/.etc/ ...\n"
                        mkdir -p "$HOME/.etc"
                        Copy_File sys/bashrc $HOME/.etc/bashrc "$user" 600
@@ -84,6 +84,21 @@ Config_User() {
        fi
 }
 
+Config_Skel() {
+       if [ -w /etc/skel ]; then
+               Msg "Starting \"/etc/skel\" configuration:\n"
+               Copy_File user/bash_logout /etc/skel/.bash_logout
+               if [ -e /etc/skel/.profile ]; then
+                       Copy_File user/bash_profile /etc/skel/.profile root 644
+               else
+                       Copy_File user/bash_profile /etc/skel/.bash_profile root 644
+               fi
+               Copy_File user/bashrc /etc/skel/.bashrc root 644
+       else
+               Msg "Can't write to \"/etc/skel\" - configuration SKIPPED.\n"
+       fi
+}
+
 Config_RootUser() {
        if [ "$UID" = "0" ]; then
                user=`grep "^.*:.*:0:" /etc/passwd | head -n 1 | cut -d':' -f1`
@@ -94,6 +109,17 @@ Config_RootUser() {
        fi
 }
 
+while [ $# -gt 0 ]; do
+       case "$1" in
+       "--local"|"-l")
+               export I_local=1; ;;
+       *)
+               echo "Usage: $0 [--local|-l]"
+               exit 1
+       esac
+       shift
+done
+
 [ -n "$UID" ] || UID=`id -u`
 export UID
 
@@ -102,6 +128,7 @@ Msg "Running $NAME (uid=$UID) ...\n"
 user=`basename "$HOME"`
 
 Config_System
+Config_Skel
 Config_User "$user" "$HOME"
 Config_RootUser