Fix bugs from previous commit.

diff --git a/bin/symlink.sh b/bin/symlink.sh
index 49a1161408c78f6cfc9762a3de97a409080e0661..d653a0b9d01001957dd8be53002ff1c0110afe46 100755 (executable)
--- a/bin/symlink.sh
+++ b/bin/symlink.sh
@@ -8,11 +8,11 @@ dir_user_prefix=~/config/dotfiles/user
 dir_user_minimal=$dir_user_prefix/minimal
 dir_user_machine=$dir_user_prefix/$1/minimal
 if [ "$3" = "" ]; then
-    dir_user_variety=$dir_user_machine/$2
+    dir_user_variety=$dir_user_prefix/$1/$2
 else
-    dir_user_variety=$dir_user_machine/$2/minimal
+    dir_user_variety=$dir_user_prefix/$1/$2/minimal
 fi
-dir_user_subvariety=$dir_user_variety/$3
+dir_user_subvariety=$dir_user_prefix/$1/$2/$3
 dir_root=~/config/dotfiles/root
 homedir=`echo ~`
 find ~ -lname $homedir'/config/*' -delete

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 0a6fcf74355b574ee9bbc5d6523015483cfc043d..8a66d6fae9df6290d81cb0fa4f183132d9bd814f 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -182,7 +182,7 @@ if [ "$1" = "server" ]; then
     su plom -c 'mkdir -p /home/plom/mail/inbox/{cur,new,tmp}'
     su plom -c 'mkdir -p /home/plom/mail/new_inbox/{cur,new,tmp}'
     sed -i 's/^delete = true$/delete = false/g' \
-        /home/plom/config/dotfiles/user/server/getmail/getmailrc
+        /home/plom/config/dotfiles/user/server/personal/minimal/getmail/getmailrc
     DEBIAN_FRONTEND=noninteractive apt-get -y install getmail4 procmail mutt \
         postfix maildrop
     cp config/systemfiles/main.cf /etc/postfix/main.cf