Sandbox: ikiwiki: copy .gitignore only if needed

diff --git a/TODO.md b/TODO.md
index b106e2641bbf5740192d7731dbd0f66e84409493..dd245e4d88fd6d3d674e98814316a19268272b14 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -2,6 +2,7 @@ TODO
 ====
 
 * Better sandbox template
+  * Should work for more use cases.
   * Should be indepotent.
   * Asking whether to setup:
     * Vagrant.

diff --git a/sandbox b/sandbox
index 7eda3290297e508c6b28a9be80f7183df643142b..88f8fca2d960b89e5ae32809fb0b720fa4cd87a8 100755 (executable)
--- a/sandbox
+++ b/sandbox
@@ -2,7 +2,6 @@
 #
 # Setup a new code project.
 #
-# TODO: should work for more use cases.
 
 # Parameters
 BASENAME="`basename $0`"
@@ -12,11 +11,13 @@ REPO="$2"
 BOOTSTRAP="git://git.sarava.org/puppet-bootstrap.git"
 TEMPLATES="git://git.sarava.org/templates.git"
 
+# Initialize project
 function sandbox_init {
   echo "Initializing $PROJECT..."
   mkdir -p $CODE/$PROJECT
 }
 
+# Git integration
 function sandbox_git {
   (
     cd $CODE/$PROJECT
@@ -52,8 +53,8 @@ function sandbox_git {
   )
 }
 
-function sandbox_ikiwiki {
 # Ikiwiki integration
+function sandbox_ikiwiki {
   (
     if [ ! -d "$HOME/file/templates" ]; then
       echo "Please clone $TEMPLATES into $HOME/file/templates"
@@ -63,7 +64,11 @@ function sandbox_ikiwiki {
       cd $CODE/$PROJECT
       git checkout develop
 
-      cat $HOME/file/templates/ikiwiki/.gitignore  >> .gitignore
+      if [ ! -e ".gitignore" ]; then
+        cp $HOME/file/templates/ikiwiki/.gitignore .
+      elif ! grep -q -f $HOME/file/templates/ikiwiki/.gitignore; then
+        cat $HOME/file/templates/ikiwiki/.gitignore >> .gitignore
+      fi
 
       if [ ! -e "index.mdwn" ]; then
         cp $HOME/file/templates/ikiwiki/index.mdwn .
@@ -89,8 +94,8 @@ function sandbox_ikiwiki {
   )
 }
 
+# Vagrant integration
 function sandbox_vagrant {
-  # Vagrant integration
   (
     echo ""
     echo "Setting up vagrant integration..."