From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 10 Mar 2013 21:22:06 +0000 (+0100)
Subject: sync.sh,update.sh: Remove.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=8a427ad85344fec72f3ecafb78999af6db6c4f2b;p=config%2Fdotfiles.git

sync.sh,update.sh: Remove.

Old unnecessary scripts, use git-recursive instead.
---

diff --git a/sync.sh b/sync.sh
deleted file mode 100755
index 6600c88..0000000
--- a/sync.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# Syncs with remote hosts in the git (sub)directories.
-#
-# Allows fetching (no merge) and pushing at the moment.
-
-
-# Select the method: fetch, push and status is possible.
-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
-else
-    echo "Usage: sync.sh [fetch | fe | push | pu | status | st]"
-    echo
-    echo "fetch: Fetch from all remotes."
-    echo "push: Push to all remotes."
-    echo "status: Display status for all git repositories."
-    exit 1
-fi
-
-# Execute the given method for each git subdirectory.
-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 (which have to be merged
-    # from the remote branches) or not in the remote branches (which have to
-    # be pushed to the remote hosts).
-    if [ $method = status ]; then
-        # Display a log similar to gitk but for the console.
-        git_log() {
-            output=`git log --graph --all --pretty=oneline --color $1`
-            if [ "x$output" != x ]; then
-                echo $2
-                echo "$output"
-            fi
-        }
-
-        # Display unmerged commits.
-        git_log master.. "$project needs merge:"
-
-        # Display not pushed commits.
-        for branch in `git branch -r`; do
-            branch=`echo "$branch" | sed 's|* ||g'`
-            git_log "$branch.." "$project ($branch) needs push:"
-        done
-
-    # Fetch from/Push to all remotes.
-    else
-        for remote in `git remote`; do
-            echo "$project: ${method}ing $remote ..."
-            git $method "$remote"
-        done
-    fi
-
-    cd "$pwd"
-done
-
-# Run status after a fetch to see new changes.
-if [ $method = fetch ]; then
-    ./sync.sh status
-fi
diff --git a/update.sh b/update.sh
deleted file mode 100755
index d65bd69..0000000
--- a/update.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Update all git repositories to the latest available changes. This should be
-# run on remote servers after new commits where pushed to them.
-
-
-pwd=`pwd`
-for path in `find . -name .git -type d`; do
-    cd $path; cd ..
-
-    # Merge all branches into master if it's checked out. Then run ./setup.sh
-    # to make sure all configuration files get updated.
-    if `git branch | grep *\ master > /dev/null`; then
-        echo $path:
-        for branch in `git branch -r`; do
-            echo "  merging: $branch"
-            git merge $branch
-        done
-        echo "  running ./setup.sh"
-        ./setup.sh > /dev/null || exit 1
-    fi
-
-    cd $pwd
-done