Fix some issues with dotfiles directories structure.

[config] / symlink.sh

diff --git a/symlink.sh b/symlink.sh
index fabee57c51f2969ba963d8ec0221dcf6b5b9736a..412b55d9e3001c7d8b425902eaa26b66ed9a47a8 100755 (executable)
--- a/symlink.sh
+++ b/symlink.sh
@@ -2,30 +2,31 @@
 
 set -x
 
-dir_minimal=~/config/dotfiles_minimal
-dir_user_minimal=~/config/dotfiles_user_minimal
-dir_user_thinkpad=~/config/dotfiles_user_thinkpad
-dir_user_server=~/config/dotfiles_user_server
-dir_root=~/config/dotfiles_root
+dir_minimal=~/config/dotfiles/minimal
+dir_user_minimal=~/config/dotfiles/user/minimal
+dir_user_thinkpad=~/config/dotfiles/user/thinkpad
+dir_user_server=~/config/dotfiles/user/server
+dir_root=~/config/dotfiles/root
 homedir=`echo ~`
 find ~ -lname $homedir'/config/*' -delete
 for file in `ls $dir_minimal`; do
     ln -fs $dir_minimal/$file ~/.$file
 done
-for file in `ls $dir_user_minimal`; do
-    ln -fs $dir_user_minimal/$file ~/.$file
-done
-if [ "$1" = "thinkpad" ]; then
-    for file in `ls $dir_user_thinkpad`; do
-        ln -fs $dir_user_thinkpad/$file ~/.$file
-    done
-elif [ "$1" = "server" ]; then
-    for file in `ls $dir_user_server`; do
-        ln -fs $dir_user_server/$file ~/.$file
-    done
-fi
 if [ "$(id -u)" -eq "0" ]; then
     for file in `ls $dir_root`; do
         ln -fs $dir_root/$file ~/.$file
     done
+else
+    for file in `ls $dir_user_minimal`; do
+        ln -fs $dir_user_minimal/$file ~/.$file
+    done
+    if [ "$1" = "thinkpad" ]; then
+        for file in `ls $dir_user_thinkpad`; do
+            ln -fs $dir_user_thinkpad/$file ~/.$file
+        done
+    elif [ "$1" = "server" ]; then
+        for file in `ls $dir_user_server`; do
+            ln -fs $dir_user_server/$file ~/.$file
+        done
+    fi
 fi