From 8bfdb1fb9e07d4caeb9067678c2185fb55c51296 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <tonydamage@gmail.com>
Date: Fri, 28 Nov 2014 16:36:44 +0100
Subject: [PATCH] Added support for ./local/bin folder. Added prototype of java
 aliases

---
 bash_aliases   | 6 ++++++
 bash_variables | 0
 bashrc         | 9 +++------
 3 files changed, 9 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 bash_aliases
 mode change 100644 => 100755 bash_variables

diff --git a/bash_aliases b/bash_aliases
old mode 100644
new mode 100755
index ec906a9..8fcd7ea
--- a/bash_aliases
+++ b/bash_aliases
@@ -1,2 +1,8 @@
 # Maven Aliases
 alias mci="mvn clean install"
+
+# GIT and GITK Aliases
+alias gitk-all="(git branch -l) | sed "s/^*//" | xargs gitk"
+
+# alias analyse-java-name-conflict="find -iname *.java | grep -v package-info.java | grep -v yang-gen | grep -v target | sed "s/[\\.a-z0-9\\/\\-]*\\/\([\\\$a-zA-Z0-9]*\)\.java/\1/g" | sort | uniq -c | grep -v " 1 ""
+# alias analyse-java-annotation=find -iname "*.java" | xargs grep "@$1" | sed "s/@$1\\(.*\\)/\\1/g"
diff --git a/bash_variables b/bash_variables
old mode 100644
new mode 100755
diff --git a/bashrc b/bashrc
index 8b9a66b..36fbbe7 100755
--- a/bashrc
+++ b/bashrc
@@ -114,6 +114,9 @@ fi
 if [ -d ~/bin ]; then
 	PATH="$PATH:~/bin"
 fi
+if [ -d ~/.local/bin ]; then
+    PATH="$PATH:~/.local/bin"
+fi
 
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
@@ -129,12 +132,6 @@ parse_git_branch() {
 PS1="$PS1\$(parse_git_branch)"
  
  
- 
- 
-
-
- 
- 
 ## Finalizing section
  
 PS1="$PS1\$ ";