added support for .dontlink markers

src/DotFS.hs

@@ -57,7 +57,7 @@ printScript mountpoint (C confdir) = concat (intersperse "\n"
     , "# Will not overwrite files or directories, but will update"
     , "# symlinks, if found."
     , "#"
-    , "# (c) Paul van der Walt, March 2012"
+    , "# (c) Paul van der Walt, April 2012"
     , ""
     , "home=$HOME"
     , "confdir=\"" ++ confdir ++ "\""
@@ -68,7 +68,7 @@ printScript mountpoint (C confdir) = concat (intersperse "\n"
     , "do"
     , "  # skip the breadcrumbs"
     , "  # skip .git too, since it makes shit way slow"
-    , "  if [ \"$i\" = \".\" ] || [ \"$i\" = \"..\" ] || [ \"$i\" = \".git\" ] ; "
+    , "  if [ \"$i\" = \".\" ] || [ \"$i\" = \"..\" ] || [ \"$i\" = \".git\" ] || [ \"${i##*.}\" = \"dontlink\" ]; "
     , "  then "
     , "    continue"
     , "  fi"
@@ -78,6 +78,7 @@ printScript mountpoint (C confdir) = concat (intersperse "\n"
     , "  # note that preserving the tree structure here"
     , "  # happens automatically, since `ls` only goes 1 deep."
     , "  target=\"$mountpoint/$i\""
+    , "  target_orig=\"$confdir/$i\""
     , "  if [ -L \"$newsource\" ] ; # -L <=> exists and is symlink"
     , "  then"
     , "    # rm old link"
@@ -88,11 +89,12 @@ printScript mountpoint (C confdir) = concat (intersperse "\n"
     , "  # in the case of directories, it thinks the newsource is"
     , "  # WHERE you'd like the link, i.e. you get stuff like:"
     , "  # `~/.somefolder/.somefolder` -> `mountpoint/.somefolder`"
-    , "  if [ -e \"$newsource\" ] ; # -e <=> file exists"
-    , "  then"
-    , "  echo \"Skipping $newsource.\""
-    , "    continue"
-    , "  fi"
-    , "  echo ln -s -v \"$target\" \"$newsource\""
+    , "  echo \"if [ ! -e \"$newsource\" ] ; then # -e <=> file exists\""
+    , "  echo \"  if [ -e \"$target_orig.dontlink\" ] ; then\""
+    , "  echo \"    ln -s -v \"$target_orig\" \"$newsource\"\""
+    , "  echo \"  else\""
+    , "  echo \"    ln -s -v \"$target\" \"$newsource\"\""
+    , "  echo \"  fi\""
+    , "  echo \"fi\""
     , "done"
     ])