浏览代码

Fix error when linking files.

Drew 12 年之前
父节点
当前提交
e12519f953
共有 1 个文件被更改,包括 11 次插入8 次删除
  1. 11 8
      scripts/install

+ 11 - 8
scripts/install

@@ -1,6 +1,8 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+exclude=("scripts" "README.md")
+configs=("conky" "openbox" "tint2")
 
 elemIn() {
   for e in "${@:2}"; do
@@ -10,28 +12,29 @@ elemIn() {
 }
 
 link() {
-  if [ -e "$1/.$2" ]; then
-    read -p "$1/.$2 exists! Delete? [y/N] " -n 1 -r
+  if [ -e "$1/$3$2" ]; then
+    read -p "$1/$3$2 exists! Delete? [y/N] " -n 1 -r
     if [[ $REPLY =~ ^[Yy]$ ]]; then
-      rm -rf "$1/.$2"
-      ln -sn "$DIR/$2" "$1/.$2"
+      # It might be a very, very bad idea to rm -rf.
+      rm -rf "$1/$3$2"
+      ln -sn "$DIR/$2" "$1/$3$2"
     fi
     echo ""
   else
-    ln -sn "$DIR/$2" "$1/.$2"
+    ln -sn "$DIR/$2" "$1/$3$2"
   fi
 }
 
-exclude=("scripts" "README.md")
-configs=("conky" "openbox" "tint2")
 for i in $(ls "$DIR"); do
   elemIn "$i" "${exclude[@]}"
   if [[  $? == 1 ]]; then continue; fi
   elemIn "$i" "${configs[@]}"
   if [[ $? == 1 ]]; then
+    echo "Linking $i to $HOME/.config/$i"
     link "$HOME/.config" "$i"
   else
-    link "$HOME" "$i"
+    echo "Linking $i to $HOME/.$i"
+    link "$HOME" "$i" "."
   fi
 done