Merge pull request #8 from nschlimm/feature/menucache

Feature/menucache

Author: nschlimm

.gitignore

@@ -1 +1,2 @@
+*launch.json
 EasyKey.git/.ezk-git-loca-conf

EasyKey.bash/bashstuff.sh

@@ -35,4 +35,4 @@ menuInit "EasyKey.bash"
   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 ."
-startMenu "$(pwd)"
+startMenu "pwd"

EasyKey.bash/ezk-locations.sh

@@ -12,33 +12,29 @@ function toDirAndTerminate () {
   blueLog "toDir $vars"
   eval "cd ${vars// /\\ }" # escape spaces
   nowaitonexit
+  terminate
 }
 
 # Reads the config into global array "workspaces"
 # The config needs to have that section [workspaces]
 initConfig "${script_dir}/EasyKey.bash/${configfilename}"
 
-echo "${locations[@]}"
-
 clear
 thekeys=($(echo {a..p}) $(echo {r..z}) $(echo {1..9}) $(echo {A..Z}))
 declare -x keycounter=1
 
-immediateMode=true
-
-menuInit "Quick Locations"
-echo
-submenuHead "Registered locations:"
+echo "Quick locations:"
 OLD_IFS=$IFS
 for (( i = 1; i < (( ${#locations[@]} + 1 )); i++ )); do
     IFS="=" read -r locname locdestination <<< "${locations[i]}"
     menuItem "${thekeys[keycounter]}" "$locdestination" "toDirAndTerminate ${locdestination}"
+    echo "${thekeys[keycounter]}". "$locdestination"
     ((keycounter++))
 done
 IFS=$OLD_IFS
-echo
 submenuHead "Shortcuts"
 menuItem X "Purge git dir cache" purgDirCache
 choice
 
+source "${script_dir}/shellmenu.sh"
 unset locations

EasyKey.git/ezk-git-atis.sh

@@ -1,6 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# all your menu actions here
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$script_dir/../shellmenu.sh"
+source "$script_dir/ezk-git-functions.sh"
 
 function listAuthorCommits () {
 	executeCommand "git authors --list"
@@ -31,12 +33,9 @@ function oneCommit () {
 	git diff $commit^ $commit --name-status
 }
 
-while ${continuemenu:=true}; do
-clear
 menuInit "Inspecting repositories"
 submenuHead "State of working tree and stage (git status)"
 menuItem a "List which files are staged, unstaged, and untracked" "git status -s"
-echo
 submenuHead "Information regarding the committed project history (git log)"
 menuItem b "Display commit history in one line" "git log --oneline"
 menuItem c "Show which files were altered in commits" "git log --stat"
@@ -45,7 +44,5 @@ menuItem e "Search for commits by a particular author" listAuthorCommits
 menuItem f "Only display commits that include the specified file" listFileCommits
 menuItem g "Display a full diff of all the changes someone has made to a file" authorDiffFile
 menuItem h "Display contents of one commit" oneCommit
-echo
-choice
-done
+startMenu
 noterminate

EasyKey.git/ezk-git-atln.sh

@@ -1,24 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
-# submenus
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$script_dir/../shellmenu.sh"
+source "$script_dir/ezk-git-functions.sh"
 
 function savingChanges () {
-	source $script_dir/../EasyKey.git/ezk-git-atsc.sh
+	bash $script_dir/../EasyKey.git/ezk-git-atsc.sh
     nowaitonexit
 }
 
 function inspectingRepos () {
-	source $script_dir/../EasyKey.git/ezk-git-atis.sh
+	bash $script_dir/../EasyKey.git/ezk-git-atis.sh
 	nowaitonexit
 }
 
 function undoingChanges () {
-	source $script_dir/../EasyKey.git/ezk-git-atuc.sh
+	bash $script_dir/../EasyKey.git/ezk-git-atuc.sh
 	nowaitonexit
 }
 
 function mergeRebase () {
-	source $script_dir/../EasyKey.git/ezk-git-reme.sh
+	bash $script_dir/../EasyKey.git/ezk-git-reme.sh
 	nowaitonexit
 }
 
@@ -31,18 +33,15 @@ cherryPick() {
    git cherry-pick "$cname" 
 }
 
-while ${continuemenu:=true}; do
-clear
+atlnStatus() {
+  echo "Atlassians view on GIT, https://de.atlassian.com/git/tutorials"
+}
+
 menuInit "Atlassian's View"
-echo "Atlassians view on GIT, https://de.atlassian.com/git/tutorials"
-echo 
 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 
-echo
-showStatus
-choice
-done
+startMenu "atlnStatus"
 noterminate

EasyKey.git/ezk-git-atsc.sh

@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$script_dir/../shellmenu.sh"
+source "$script_dir/ezk-git-functions.sh"
 
 function interStage () {
 	git add -p
@@ -131,47 +135,36 @@ function ignoreMenu () {
 	nowaitonexit
 }
 
-while ${continuemenu:=true}; do
-clear
 menuInit "Saving changes"
 submenuHead "Adding changes to stage:"
 menuItem a "Git add all gently" addAllGently
 menuItem b "Git interactive staging session" interactiveStage
 menuItem c "Git interactive staging detail session" interStage
-echo
 submenuHead "Commit changes:"
 menuItem d "Commit staged snapshot - vim (stage -> archive)" commitStagedSnapshot
 menuItem f "Commit all changes of tracked files - vim (tree -> stage -> archive)" commitChangesVim
 menuItem g "Commit all changes of tracked files - read (tree -> stage -> archive)" commitChanges
-echo
 submenuHead "Stash current changes:"
 menuItem h "Stash current changes" stash
 menuItem i "Reapply stash to current directory (pop - deletes stash)" stashPop
 menuItem j "Reapply stash to current directory (apply - leaves stash alive)" stashApply
 menuItem k "Stash current changes - include untracked" stashAllIncludeUntracked
 menuItem l "Stash current changes - include all untracked and ignored" stashAll
-echo
 submenuHead "Managing multiple stashes:"
 menuItem m "List stashes" stashList
 menuItem n "Stash with message" stashWithMessage
 menuItem o "Reapply stash to current directory from stash list (pop)" stashPopFromList
 menuItem p "Reapply stash to current directory from stash list (apply)" stashApplyFromList
-echo
 submenuHead "Clean up stashes:"
 menuItem r "Delete all stashes" stashDeleteAll
 menuItem s "Delete specific stash" stashDeleteSpecific
-echo
 submenuHead "Other stash stuff:"
 menuItem t "View summary of a stash (stash state vs. original parent commit)" stashSummary
 menuItem u "View diff of a stash (stash state vs. original parent commit)" stashDiff
 menuItem v "Stash single files" stashSingle
 menuItem w "Create branch from stash" stashBranch
 menuItem x "Inspect stashes" inspectStash
-echo
 submenuHead "Ignoring files:"
 menuItem y "Ignore menu" ignoreMenu
-echo
-showStatus
-choice
-done
+startMenu
 noterminate

EasyKey.git/ezk-git-atsu.sh

@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$script_dir/../shellmenu.sh"
+source "$script_dir/ezk-git-functions.sh"
 
 function atLocalGit () {
 
@@ -104,15 +108,12 @@ function adminAliases() {
     fi      
 }
 
-while ${continuemenu:=true}; do
-clear
 menuInit "Repositories"
 submenuHead "Setting up repositories"
 menuItem a "Transform the current directory into a git repository" atLocalGit
 menuItem b "Setting up a git repository in a directory" atLocalGitWithDir
 menuItem c "Setting up a shared git repository in a directory" atLocalGitBare
 menuItem d "Clone a remote repository" cloneRemote
-echo
 submenuHead "Configure repositories:"
 menuItem e "Define the author name and email to be used for all commits" defineAuthor
 menuItem f "Administering aliases" adminAliases
@@ -121,7 +122,6 @@ menuItem h "Define merge/diff tool" defineMergeTool
 menuItem i "Open global config" openGlobalConfig
 menuItem j "Open system config" openSystemConfig
 menuItem k "Open local config" openLocalConfig
-
-choice
-done
+startMenu
+noterminate
 noterminate

EasyKey.git/ezk-git-diff.sh

@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$script_dir/../shellmenu.sh"
+source "$script_dir/ezk-git-functions.sh"
 
 function numberedList () {
   kommando="$1"
@@ -81,34 +85,30 @@ function diffDate () {
    # alternative: git diff 'HEAD@{2017-03-03T00:00:00}' HEAD --name-status | nl
 }
 
+diffStatus() {
+  showStatus
+  echo
+  echo "Note: GIT diff cann compare four locations with each other: "
+  echo "      your working directory, the stage, the repository."
+  echo
+  coloredLog "┌────────┐    ┌────────┐    ┌────────┐    ┌────────┐" "$clrPurple" "$clrBlack"
+  coloredLog "│        │    │        │    │        │    │        │" "$clrPurple" "$clrBlack"
+  coloredLog "│        │ -> │        │ -> │        │ -> │        │" "$clrPurple" "$clrBlack"
+  coloredLog "└────────┘    └────────┘    └────────┘    └────────┘" "$clrPurple" "$clrBlack"
+  coloredLog " work dir       stage       local repo    remote repo" "$clrWhite" "$clrBlack"
+}
+
 git fetch --all
-while ${continuemenu:=true}; do
-clear
 menuInit "Working with diffs"
-echo
-echo "Note: GIT diff cann compare four locations with each other: "
-echo "      your working directory, the stage, the repository."
-echo
-coloredLog "┌────────┐    ┌────────┐    ┌────────┐    ┌────────┐" "$clrPurple" "$clrBlack"
-coloredLog "│        │    │        │    │        │    │        │" "$clrPurple" "$clrBlack"
-coloredLog "│        │ -> │        │ -> │        │ -> │        │" "$clrPurple" "$clrBlack"
-coloredLog "└────────┘    └────────┘    └────────┘    └────────┘" "$clrPurple" "$clrBlack"
-coloredLog " work dir       stage       local repo    remote repo" "$clrWhite" "$clrBlack"
-echo
-submenuHead "Different diff options:"
-menuItem a "actual branch        vs. origin/actual branch.      -> local repository vs. remote repository" headHead
-menuItem b "actual working dir   vs. actual branch last commit  -> work dir vs. local repository" dirHead
-menuItem c "actual working dir   vs. other commits              -> work dir vs. local repository" treeCommit
-menuItem d "commit               vs. commit                     -> local repository vs. local repository" commitCommit
-menuItem e "branch               vs. branch                     -> repository vs. repository (local/remote)" branchBranch
-echo
-submenuHead "Specific diffs:"
-menuItem k "Diff since date" diffDate
-echo
-submenuHead "Other usefull stuff here:"
-menuItem h "show commits" showCommits
-echo
-showStatus
-choice
-done
+  submenuHead "Different diff options:"
+    menuItem a "actual branch        vs. origin/actual branch.      -> local repository vs. remote repository" headHead
+    menuItem b "actual working dir   vs. actual branch last commit  -> work dir vs. local repository" dirHead
+    menuItem c "actual working dir   vs. other commits              -> work dir vs. local repository" treeCommit
+    menuItem d "commit               vs. commit                     -> local repository vs. local repository" commitCommit
+    menuItem e "branch               vs. branch                     -> repository vs. repository (local/remote)" branchBranch
+  submenuHead "Specific diffs:"
+    menuItem k "Diff since date" diffDate
+  submenuHead "Other usefull stuff here:"
+    menuItem h "show commits" showCommits
+startMenu "diffStatus"
 noterminate

EasyKey.git/ezk-git-extras.sh

@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "$script_dir/../shellmenu.sh"
+source "$script_dir/ezk-git-functions.sh"
 
 function changeBlame () {
 	git log --pretty=format:'%Cred%h%Creset | %Cgreen%ad%Creset | %s %C(yellow)%d%Creset %C(bold blue)[%an]%Creset %Cgreen(%cr)%Creset' --graph --date=short
@@ -38,8 +42,6 @@ function obliterate () {
 
 }
 
-while ${continuemenu:=true}; do
-clear
 menuInit "Git extras menu"
 submenuHead "Project information"
 menuItem a "Project summary in commits" "git summary"
@@ -50,17 +52,13 @@ menuItem e "Show information about the repo" "git info"
 menuItem f "Generate changelog" "git changelog -a"
 menuItem g "Show tree" "git show-tree"
 menuItem h "Show activity calendar" "git cal"
-echo
 submenuHead "Author information"
 menuItem k "List authors" "git authors --list"
 menuItem l "Find out what somebody did since ..." findOut
 menuItem m "Display change in blame between two revisions" changeBlame
-echo
 submenuHead "Effect repository actions"
 menuItem q "Remove latest commits and add their changes to stage" removeLatest
 menuItem r "Completely remove a file from the repository" obliterate
 menuItem s "Setup git repository in current dir" "git setup"
-echo
-choice
-done
+startMenu
 noterminate

EasyKey.git/ezk-git-functions.sh

@@ -272,12 +272,13 @@ function fetchAll () {
 # submenus
 
 function workingDiffs() {
-  source $script_dir/../EasyKey.git/ezk-git-diff.sh
+  unset form
+  bash $script_dir/../EasyKey.git/ezk-git-diff.sh
   nowaitonexit
 }
 
 function atlassiansView() {
-  source $script_dir/../EasyKey.git/ezk-git-atln.sh
+  bash $script_dir/../EasyKey.git/ezk-git-atln.sh
   nowaitonexit
 }
 
@@ -288,7 +289,7 @@ function changeProject () {
 }
 
 function gitExtras () {
-  source $script_dir/../EasyKey.git/ezk-git-extras.sh
+  bash $script_dir/../EasyKey.git/ezk-git-extras.sh
   nowaitonexit
 }
 
@@ -378,6 +379,6 @@ repoSize() {
 }
 
 function settingUp () {
-    source $script_dir/../EasyKey.git/ezk-git-atsu.sh
+    bash $script_dir/../EasyKey.git/ezk-git-atsu.sh
     nowaitonexit
 }