1 files changed, 69 insertions, 11 deletions

diff --git a/task-git.sh b/task-git.sh
index 26af83d..4f4e8c3 100755
--- a/task-git.sh
+++ b/task-git.sh
@@ -2,33 +2,91 @@
 
 # Get task command
 TASK_COMMAND="task ${@}"
+
 # Get data dir
 DATA_RC=$(task _show | grep data.location)
 DATA=(${DATA_RC//=/ })
 DATA_DIR=${DATA[1]}
-if [ ! -d "$DATA_DIR" ]; then
-  echo 'Could not load data directory!'
-  exit 1
+
+# Need to expand home dir ~
+eval DATA_DIR=$DATA_DIR
+
+# Exit if we don't have a tasks data directory
+if [ ! -e "$DATA_DIR" ]; then
+    echo "Could not load data directory $DATA_DIR."
+    exit 1
+fi
+
+# Check if git repo exists
+if ! [ -d "$DATA_DIR/.git" ]; then
+    echo "Initializing git repo"
+    pushd $DATA_DIR
+    git init
+    git add *
+    git commit -m "Initial Commit"
+fi
+
+# Push by default
+PUSH=1
+PULL=0
+
+# Check if we have a place to push to
+GIT_REMOTE=$(git remote -v | grep push | grep origin | awk '{print $2}')
+if [ -z $GIT_REMOTE ]; then
+    # No place to push to
+    PUSH=0
 fi
 
-# Check if --task-git-push is passed as an argument.
-PUSH=0
+# Check if --no-push is passed as an argument.
 for i
 do
-  if [ "$i" == "--task-git-push" ]; then
-    # Set the PUSH flag, and remove this from the arguments list.
-    PUSH=1
-    shift
-  fi
+    if [ "$i" == "--no-push" ]; then
+        # Set the PUSH flag, and remove this from the arguments list.
+        PUSH=0
+        shift
+    fi
 done
 
+# Check if we are passing something that doesn't do any modifications
+for i in $@
+do
+    case $i in
+        add|append|completed|delete|done|due|duplicate|edit|end|modify|prepend|rm|start|stop)
+            if [ "$PUSH" == 1 ]; then
+                PUSH=1
+            fi
+            ;;
+        push)
+            if [ "$PUSH" == 1 ]; then
+                PUSH=1
+            fi
+            ;;
+        pull)
+            echo "Pull"
+            PULL=1
+            ;;
+        *)
+            PUSH=0
+            ;;
+    esac
+done
+
+if [ "$PULL" == 1 ]; then
+    echo "Fetching & Applying updates from $GIT_REMOTE"
+    git fetch && git pull
+    exit 0
+fi
+
 # Call task, commit files and push if flag is set.
 /usr/bin/task $@
+
+
 cd $DATA_DIR
 git add .
 git commit -m "$TASK_COMMAND" > /dev/null
 
 if [ "$PUSH" == 1 ]; then
-  git push origin master > /dev/null
+    echo "Pushing updates to $GIT_REMOTE"
+    git push origin master > /dev/null
 fi
 exit 0