Move install code to Config_System() and Config_User() functions.

diff --git a/install.sh b/install.sh
index 372606925ba93e25e4582420807f656f5e638678..4f60f06ece84adab0d2bb4d812bdefb8c95758b7 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -32,6 +32,54 @@ Copy_File() {
        Msg "- OK.\n"
 }
 
+Config_System() {
+       if [ "$UID" = "0" ]; then
+               Msg "Starting system configuration:\n"
+               Msg " - bash shell:\n"
+               if [ -e /etc/bash.bashrc ]; then
+                       Copy_File sys/bashrc /etc/bash.bashrc root 644
+               else
+                       Copy_File sys/bashrc /etc/bashrc root 644
+               fi
+               Copy_File sys/profile /etc/profile root 644
+       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
+                       Msg "Installing system files to $HOME/.etc/ ...\n"
+                       mkdir -p "$HOME/.etc"
+                       Copy_File sys/bashrc $HOME/.etc/bashrc "$user" 600
+                       Copy_File sys/profile $HOME/.etc/profile "$user" 600
+               else
+                       Msg "System configuration seems to be modified: not installing locally.\n"
+               fi
+       fi
+}
+
+Config_User() {
+       # $1: user name
+       # $2: home directory
+
+       user="$1"
+       home="$2"
+
+       Msg "Starting user configuration ($user in $home):\n"
+       touch "$home/.test.$$" >/dev/null 2>&1
+       if [ $? -eq 0 ]; then
+               rm -f "$home/.test.$$"
+               Msg " - bash shell:\n"
+               if [ -e "$home/.profile" ]; then
+                       Copy_File user/bash_profile "$home/.profile" "$user" 600
+               else
+                       Copy_File user/bash_profile "$home/.bash_profile" "$user" 600
+               fi
+               Copy_File user/bashrc "$home/.bashrc" "$user" 600
+               Copy_File user/bash_logout "$home/.bash_logout" "$user" 600
+       else
+               Msg "Can't write to user home directory - user configuration SKIPPED.\n"
+       fi
+}
+
 [ -n "$UID" ] || UID=`id -u`
 export UID
 
@@ -39,43 +87,8 @@ Msg "Running $NAME (uid=$UID) ...\n"
 
 user=`basename "$HOME"`
 
-if [ "$UID" = "0" ]; then
-       Msg "Starting system configuration:\n"
-       Msg " - bash shell:\n"
-       if [ -e /etc/bash.bashrc ]; then
-               Copy_File sys/bashrc /etc/bash.bashrc root 644
-       else
-               Copy_File sys/bashrc /etc/bashrc root 644
-       fi
-       Copy_File sys/profile /etc/profile root 644
-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
-               Msg "Installing system files to $HOME/.etc/ ...\n"
-               mkdir -p "$HOME/.etc"
-               Copy_File sys/bashrc $HOME/.etc/bashrc "$user" 600
-               Copy_File sys/profile $HOME/.etc/profile "$user" 600
-       else
-               Msg "System configuration seems to be modified: not installing locally.\n"
-       fi
-fi
-
-touch "$HOME/.test.$$" >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-       rm -f "$HOME/.test.$$"
-       Msg "Starting user configuration ($user in $HOME):\n"
-       Msg " - bash shell:\n"
-       if [ -e "$HOME/.profile" ]; then
-               Copy_File user/bash_profile "$HOME/.profile" "$user" 600
-       else
-               Copy_File user/bash_profile "$HOME/.bash_profile" "$user" 600
-       fi
-       Copy_File user/bashrc "$HOME/.bashrc" "$user" 600
-       Copy_File user/bash_logout "$HOME/.bash_logout" "$user" 600
-else
-       Msg "Can't write to user home directory - user configuration SKIPPED.\n"
-fi
+Config_System
+Config_User "$user" "$HOME"
 
 Msg "$NAME: Done.\n"