From ae81044aac814009283990cc988a89f4042ffa38 Mon Sep 17 00:00:00 2001
From: Moritz Kassner <moritzkassner@gmail.com>
Date: Mon, 21 Oct 2013 13:55:47 +0200
Subject: [PATCH] removing branch switching scripts.

---
 run_capture      |  1 -
 switch_to_dev    | 83 ------------------------------------------------
 switch_to_master | 83 ------------------------------------------------
 3 files changed, 167 deletions(-)
 delete mode 100755 switch_to_dev
 delete mode 100755 switch_to_master

diff --git a/run_capture b/run_capture
index 22ff09f68c..6229d11600 100755
--- a/run_capture
+++ b/run_capture
@@ -1,6 +1,5 @@
 #!/bin/sh
 cd $(dirname $0)/pupil_src/capture
-pwd
 echo "starting PUPIL capture python script"
 python main.py
 exit 0
\ No newline at end of file
diff --git a/switch_to_dev b/switch_to_dev
deleted file mode 100755
index ada729a1b8..0000000000
--- a/switch_to_dev
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-#
-# take from https://github.com/jamiew/git-friendly
-# Usage: branch [branchname]
-#
-#
-# Switch to an existing branch, or create a new local-only branch.
-# Adds remote tracking if a remote branch with the same name exists,
-# in any remote, preferring the "origin" master if there are duplicates.
-#
-# Executing without arguments prints all local & remote branches
-#
-cd $(dirname $0)
-
-remote="origin"
-branch="dev"
-
-if [ -z $branch ]; then
-  echo -e "\nSwitch to or create a new branch:"
-  echo -e "  $(basename $0) [name]"
-  echo -e "\nCurrent branches: "
-  branches="git branch -a -vv"
-  $branches
-  echo
-  exit 0
-fi
-
-local_branch_exists=$(git branch --no-color | egrep "$branch\$")
-remote_branch_exists=$(git branch -r --no-color | egrep "$remote/$branch\$")
-remotes=( $(git remote) )
-remotes_with_branch=()
-origin_has_branch=
-
-for remote in "${remotes[@]}";
-do
-  remote_branch_exists=$(git branch -r --no-color | egrep "$remote/$branch\$")
-  if [ "$remote_branch_exists" ] ; then
-    remotes_with_branch=("${remotes_with_branch[@]}" "$remote")
-    if [ "$remote" = "origin" ] ; then
-      origin_has_branch=1
-    fi
-  fi
-done
-
-if [ ${#remotes_with_branch[@]} -gt 0 ]; then
-  # if there's an origin remote with the named branch, use it
-  if [ "$origin_has_branch" = "1" ] ; then
-    remote=origin
-  else # track the first matching branch alphabetically
-    remote=${remotes[0]}
-  fi
-  remote_branch_exists="$remote/$branch"
-fi
-
-# If local exists already, switch to it
-if [ -n "$local_branch_exists" ] && [ ! "$local_branch_exists" == '' ]; then
-  echo "Switching to existing local branch..."
-  git checkout $branch
-
-  # Track remote branch if not already
-  if [ -n "$remote_branch_exists" ] && [ ! "$remote_branch_exists" == '' ]; then
-    tracking=$(git branch -vv | grep "*" | awk '{ print $4 '})
-    # echo "Remote branch exists. Local branch is tracking: $tracking"
-    if [[ ! "$tracking" =~ "$remote" ]]; then
-      echo "Your local branch is not tracking the corresponding remote branch, fixing..."
-      git branch --set-upstream-to $branch $remote/$branch
-    fi
-  # else
-  #   echo "Remote branch does not exist, not doing anything"
-  fi
-
-# If remote exists, create a local branch that tracks the remote
-elif [ -n "$remote_branch_exists" ] && [ ! "$remote_branch_exists" == '' ]; then
-  echo "Tracking existing remote branch '$remote_branch_exists'..."
-  git checkout -b $branch --track $remote/$branch
-
-# Otherwise create a new local branch
-else
-  echo "Creating new local branch..."
-  git checkout -b $branch --no-track
-fi
-
-exit 0
\ No newline at end of file
diff --git a/switch_to_master b/switch_to_master
deleted file mode 100755
index a9d5206e22..0000000000
--- a/switch_to_master
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-#
-# take from https://github.com/jamiew/git-friendly
-# Usage: branch [branchname]
-#
-#
-# Switch to an existing branch, or create a new local-only branch.
-# Adds remote tracking if a remote branch with the same name exists,
-# in any remote, preferring the "origin" master if there are duplicates.
-#
-# Executing without arguments prints all local & remote branches
-#
-cd $(dirname $0)
-
-remote="origin"
-branch="master"
-
-if [ -z $branch ]; then
-  echo -e "\nSwitch to or create a new branch:"
-  echo -e "  $(basename $0) [name]"
-  echo -e "\nCurrent branches: "
-  branches="git branch -a -vv"
-  $branches
-  echo
-  exit 0
-fi
-
-local_branch_exists=$(git branch --no-color | egrep "$branch\$")
-remote_branch_exists=$(git branch -r --no-color | egrep "$remote/$branch\$")
-remotes=( $(git remote) )
-remotes_with_branch=()
-origin_has_branch=
-
-for remote in "${remotes[@]}";
-do
-  remote_branch_exists=$(git branch -r --no-color | egrep "$remote/$branch\$")
-  if [ "$remote_branch_exists" ] ; then
-    remotes_with_branch=("${remotes_with_branch[@]}" "$remote")
-    if [ "$remote" = "origin" ] ; then
-      origin_has_branch=1
-    fi
-  fi
-done
-
-if [ ${#remotes_with_branch[@]} -gt 0 ]; then
-  # if there's an origin remote with the named branch, use it
-  if [ "$origin_has_branch" = "1" ] ; then
-    remote=origin
-  else # track the first matching branch alphabetically
-    remote=${remotes[0]}
-  fi
-  remote_branch_exists="$remote/$branch"
-fi
-
-# If local exists already, switch to it
-if [ -n "$local_branch_exists" ] && [ ! "$local_branch_exists" == '' ]; then
-  echo "Switching to existing local branch..."
-  git checkout $branch
-
-  # Track remote branch if not already
-  if [ -n "$remote_branch_exists" ] && [ ! "$remote_branch_exists" == '' ]; then
-    tracking=$(git branch -vv | grep "*" | awk '{ print $4 '})
-    # echo "Remote branch exists. Local branch is tracking: $tracking"
-    if [[ ! "$tracking" =~ "$remote" ]]; then
-      echo "Your local branch is not tracking the corresponding remote branch, fixing..."
-      git branch --set-upstream-to $branch $remote/$branch
-    fi
-  # else
-  #   echo "Remote branch does not exist, not doing anything"
-  fi
-
-# If remote exists, create a local branch that tracks the remote
-elif [ -n "$remote_branch_exists" ] && [ ! "$remote_branch_exists" == '' ]; then
-  echo "Tracking existing remote branch '$remote_branch_exists'..."
-  git checkout -b $branch --track $remote/$branch
-
-# Otherwise create a new local branch
-else
-  echo "Creating new local branch..."
-  git checkout -b $branch --no-track
-fi
-
-exit 0
\ No newline at end of file