sync.sh: Status is the default command now.

[config/dotfiles.git] / sync.sh

diff --git a/sync.sh b/sync.sh
index 7ffcd44f652c435882b796e63f86932b66233399..a3f9eaf124ffc324b942582a7e30ff2736fddcb2 100755 (executable)
--- a/sync.sh
+++ b/sync.sh
@@ -6,12 +6,12 @@
 
 
 # Select the method: fetch, push and status is possible.
-if [ x$1 = x -o x$1 = xfetch -o x$1 = xfe ]; then
+if [ x$1 = x -o x$1 = xstatus -o x$1 = xst ]; then
+    method=status
+elif [ $1 = fetch -o $1 = fe ]; then
     method=fetch
 elif [ $1 = push -o $1 = pu ]; then
     method=push
-elif [ $1 = status -o $1 = st ]; then
-    method=status
 else
     echo "Usage: sync.sh [fetch | fe | push | pu | status | st]"
     echo
@@ -26,10 +26,16 @@ for project in `find . -name .git -type d`; do
     pwd=`pwd`
     cd "$project"
 
+    # Remove .git from repository name.
+    project=`echo "$project" | sed "s|.git||"`
+
     # Display all commits not in the master branch.
     if [ $method = status ]; then
-        echo "$project status"
-        git log --graph --all --pretty=oneline master..
+        output=`git log --graph --all --pretty=oneline --color master..`
+        if [ "x$output" != x ]; then
+            echo "$project status:"
+            echo "$output"
+        fi
     # Fetch from/Push to all remotes.
     else
         for remote in `git remote`; do
@@ -40,3 +46,8 @@ for project in `find . -name .git -type d`; do
 
     cd "$pwd"
 done
+
+# Run status after a fetch to see new changes.
+if [ $method = fetch ]; then
+    ./sync.sh status
+fi