Changes reverted to a previous state

Author: nschlimm

EasyKey.bash/bashstuff.sh

@@ -27,12 +27,20 @@ findTextAll() {
    find . -type f -exec grep -Hn "$textPattern" {} + | awk -F ":" '{printf "%-40s %-4s %s\n", $1, $2, $3}'
 }
 
+whichSoftware() {
+   echo "Which software to search?"
+   read software
+   [ "${software}" = "" ] && waitonexit && return 
+   which -a $software
+}
+
 menuInit "EasyKey.bash"
- submenuHead "Usefull:"
+ submenuHead "Usefull "
   menuItem f "Find files by pattern" findFiles 
   menuItem t "Find text inside specific files" findText
   menuItem o "Find test inside all files" findTextAll
   menuItem l "Largest directories" "du -hsx .[!.]* * | sort -rh | head -10" 
   menuItem m "Largest files" "find . -type f -exec du -h {} + | sort -rh | head -n 10"
   menuItem n "Size of current directory" "du -sh ."
+  menuItem w "Where is my software installed?" whichSoftware
 startMenu "pwd"

EasyKey.git/ezk-git-atln.sh

@@ -37,25 +37,11 @@ atlnStatus() {
   echo "Atlassians view on GIT, https://de.atlassian.com/git/tutorials"
 }
 
-checkoutAndBranch(){
-   echo "Last 15 commits"
-   git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -n 100
-   echo "Enter commit you want to checkout:"
-   read cname
-   [ "${cname}" = "" ] && waitonexit && return 
-   executeCommand "git checkout $cname"
-   echo "Enter new branch name:"
-   read cbranch
-   [ "${cbranch}" = "" ] && waitonexit && return 
-   executeCommand "git checkout -b $cbranch"
-}
-
 menuInit "Atlassian's View"
 submenuHead "Working on your local repository"
 menuItem b "Saving changes" savingChanges
 menuItem c "Inspecting a repository" inspectingRepos
 menuItem d "Undoing changes" undoingChanges
 menuItem e "Cherry pick commit" cherryPick 
-menuItem f "Checkout commit and branch" checkoutAndBranch 
 startMenu "atlnStatus"
 noterminate

EasyKey.git/ezk-git-functions.sh

@@ -188,7 +188,7 @@ function rollBackLast() {
 
 function deleteBranch() {
   git branch
-  echo "Welchen Branch löschen?"
+  echo "Which branch to delete?"
   read dbranch
   [ "${dbranch}" = "" ] && waitonexit && return 
   git branch -d $dbranch
@@ -331,12 +331,16 @@ function setRemoteOrigin() {
    executeCommand "git remote set-url origin $originaddress"
 }
 
+newStatus() {
+   actual=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
+   git status -s 
+}
+
 function showStatus () {
   importantLog $(pwd | grep -o "[^/]*$")
   actual=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
   importantLog $actual 
-  git log --decorate --oneline -n 1
-  git status | grep "Your branch"
+  git log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s' --abbrev-commit -n 1
   analyzeWorkingDir
   git remote -v
 }

EasyKey.git/git.sh

@@ -31,5 +31,5 @@ menuInit "EasyKey.git"
   submenuHead "Shortcuts "
     menuItemClm P "Change project" changeProject B "Change branch" changeBranch
     menuItem F "Fetch all" fetchAll 
-startMenu "git status"
+startMenu "showStatus"
 echo "bye, bye, homie!"