Menu border in submenus

Author: nschlimm

EasyKey.git/git.sh

@@ -13,22 +13,22 @@ globalClmWidth=35
 git fetch --all --tags 2> /dev/null
 
 menuInit "EasyKey.git"
-  submenuHead "Working with remotes:"
+  submenuHead "Working with remotes "
     menuItemClm a "Gently push current" pushActual b "Set remote origin repo" setRemoteOrigin
     menuItemClm e "Set upstream to current" setUpstream f "Administer remotes" adminRemotes
-  submenuHead "Working on local branches:"
+  submenuHead "Working on local branches "
     menuItemClm r "Show branch history" showBranchHisto g "Show reflog" showRepoHisto
     menuItemClm v "Checkout remote branch" coRemoteBranch n "Delete local/remote branch" deleteBranch
     menuItemClm o "Merge source to target branch" mergeSourceToTarget p "Show all branches (incl. remote)" showAllBranches
     menuItemClm k "New local/remote branch checkout" newLocalBranch c "Change last commit message" "git commit --amend" 
-  submenuHead "Other usefull actions:"
+  submenuHead "Other usefull actions "
     menuItemClm s "Working with diffs" workingDiffs w "Working with commits" atlassiansView
     menuItemClm y "Setting up repositories" settingUp 5 "Git extras" gitExtras
-  submenuHead "Git admin actions:"
+  submenuHead "Git admin actions "
     menuItemClm 1 "Show local git config" localGitConfig 2 "Show global git config" globalGitConfig
     menuItemClm 3 "Administering aliases" adminAliases 4 "Show .gitignore" gitIgnore
     menuItem x "Descrease repo size" repoSize
-  submenuHead "Shortcuts"
+  submenuHead "Shortcuts "
     menuItemClm P "Change project" changeProject B "Change branch" changeBranch
     menuItem F "Fetch all" fetchAll 
 startMenu "showStatus"

EasyKey.kubectl/kubectl.sh

@@ -9,28 +9,28 @@ source "$script_dir/../shellmenu.sh"
 source "$script_dir/ezk-kubectl-functions.sh"
 
 menuInit "EasyKey.kubectl"
-  submenuHead "Kubectl Config:" "Test:"
+  submenuHead "Kubectl Config "
     menuItemClm a "Show config" "kubectl config view" b "Switch context" switchContext
     menuItemClm c "Switch namespace" switchNamespace d "Add cluster" addCluster 
     menuItemClm e "Add users (token)" addUsers f "Add context" addContext 
     menuItemClm g "Edit config" "vim ~/.kube/config" h "Create namespace" createNamespace  
-  submenuHead "Pods:"
+  submenuHead "Pods "
     menuItemClm j "List pods (ns=current)" "kubectl get pods -o wide" k "List pods (all namespaces)" "kubectl get pods --all-namespaces -o wide"
-    menuItemClm l "Show pod manifest (desired/observed)" showPodManifest m "Describe pod" describePod
+    menuItemClm l "Show pod manifest" showPodManifest m "Describe pod" describePod
     menuItemClm n "Get logs" getPodLogs o "Log on to pod" logOnPod
     menuItemClm p "Log on to DB" logOnDb r "Apply pod manifest" applyPodManifest
     menuItem s "Delete pod" deletePod
-  submenuHead "Deployments:"
+  submenuHead "Deployments "
     menuItemClm v "List deployments (ns=current)" "kubectl get deployments -o wide" w "List deployments (all namespaces)" "kubectl get deployments --all-namespaces -o wide"
-    menuItemClm x "Show deployment manifest (desired/observed)" showDeploymentManifest y "Describe deployment" describeDeployment
+    menuItemClm x "Show deployment manifest" showDeploymentManifest y "Describe deployment" describeDeployment
     menuItemClm z "List replicasets (ns=current)" "kubectl get rs -o wide" 1 "Describe replica set" describeReplicaset
     menuItemClm 2 "Redeploy" redeploy 3 "Deployment history" deplHist
     menuItemClm 4 "Undo deployment" rollbackDeployment 5 "Deployment status" deployState
     menuItem E "Edit deployment" editDeployment
-  submenuHead "Services:"
+  submenuHead "Services "
     menuItemClm 6 "List services (ns=current)" "kubectl get services -o wide" 7 "List services (all namespaces)" "kubectl get services --all-namespaces -o wide"
-    menuItemClm 8 "Show service manifest (desired/observed)" showServiceManifest 9 "Describe service" describeService
-  submenuHead "Other stuff:"
+    menuItemClm 8 "Show service manifest" showServiceManifest 9 "Describe service" describeService
+  submenuHead "Other stuff "
     menuItemClm I "List images in contexts" listImagesInUse J "Ingress configuration" "kubectl get ing -o json | jq -r '.items[].spec.rules[].http.paths[]'"
     menuItemClm K "Describe ingress" "kubectl describe ing" "L" "Edit config map" editConfigMap
     menuItem T "Edit Ingress" "kubectl edit ingress"

EasyKey.maven/maven.sh

@@ -11,7 +11,7 @@ source "$script_dir/ezk-maven-functions.sh"
 globalClmWidth=20
 
 menuInit "Super MAVEN Home"
- submenuHead "Maven:"
+ submenuHead "Working with Maven POM "
   menuItemClm a "Clean all eclipse" "mvnCleanEclipse" b "Maven analyze dependencies" "mvn dependency:analyze"
   menuItemClm c "Clean install force updates" "mvn clean install -U -DskipTests" d "To maven repo" toRepo 
   menuItemClm e "Show effective settings" "mvn help:effective-settings" f "Local repo location" "mvn help:evaluate -Dexpression=settings.localRepository | grep -v '\[INFO\]'" 
@@ -20,11 +20,11 @@ menuInit "Super MAVEN Home"
   menuItemClm k "Download sources" downLoadSources l "Build with deps" "mvn clean compile assembly:single"  
   menuItemClm m "New project from archetype" newProject p "Effective pom" "mvn help:effective-pom"
   menuItemClm t "Dependency tree" "mvn dependency:tree" u "Display dependency updates" "mvn versions:display-dependency-updates -DexcludeReactor=true"
- submenuHead "Lifecycle:"
+ submenuHead "Lifecycle "
   menuItemClm C "Clean compile" "mvn clean compile" T "Clean test" "mvn clean test"
   menuItemClm I "Clean install" "mvn clean install -DskipTests" P "Clean package" "mvn clean package -DskipTests"
   menuItem D "Clean deploy" "mvn clean deploy -DskipTests"
- submenuHead "Spring-Boot:"
+ submenuHead "Spring-Boot "
   menuItemClm o "Start Spring Boot App" startSpringBoot s "View application properties" showProperties
   menuItem v "Usefull notes" useFull
 startMenu "pwd"

shellmenu.sh

@@ -17,17 +17,18 @@ clrWhite=7
 # Globals
 waitstatus=true                     # whether to wait for key press after menu command finished
 continuemenu=true                   # whether to continue menu loop (quit will set this to false)
-globalClmWidth=45                   # the default (minimum) column width
+globalClmWidth=20                   # the default (minimum) column width
 actualmenu="EasyKey.shellmenu"      # the default menu heading
 actualsubmenuname="Your commands:"  # the default sub menu heading
 menuHeadingFGClr="$clrWhite"        # the default menu heading foreground color
 menuHeadingBGClr="$clrBlue"         # the default menu heading background color
-submenuFGClr="$clrCyan"            # the default sub menu heading foreground color
-submenuBGClr="$clrBlack"           # the default sub menu heading background color
+submenuFGClr="$clrCyan"             # the default sub menu heading foreground color
+submenuBGClr="$clrBlack"            # the default sub menu heading background color
 delimiter=⊕                         # the delimiter used in menu array
 formattedheading=""                 # the cache for formatted heading
 generatedmenu=""                    # the menu cache (menu will be compiled once and then cached)
 menudatamap=()                      # the menu data
+has_two_clms=false                  # whether the menu hast two columns (internal)
 
 ############################
 ############################
@@ -98,7 +99,8 @@ menuItem () {
 menuItemClm () {
    menudatamap+=("$1$delimiter$2$delimiter$3$delimiter$actualsubmenuname$delimiter$actualmenu${delimiter}1")
    menudatamap+=("$4$delimiter$5$delimiter$6$delimiter$actualsubmenuname$delimiter$actualmenu${delimiter}2")
-   update_column_width "$2" &&    update_column_width "$5"
+   update_column_width "$2" && update_column_width "$5"
+   has_two_clms=true
 }
 
 #################################################
@@ -133,29 +135,13 @@ startMenu() {
 # Colored log to standard out.
 # Arguments:
 #   $1: log text
-#   $2: optional: foreground color (0-7)
-#   $3: optional: background color (0-7)
-#   $4: optional: width of heading line
+#   $2: optional: foreground color
+#   $3: optional: background color
 # Outputs:
 #   Writes colored log to standard out
 #######################################
 coloredLog () {
-    set_foreground=$(tput setaf "${2:-$clrWhite}")
-    set_background=$(tput setab "${3:-$clrBlack}")
-    echo -n "$set_background$set_foreground"
-    printf "%s" "$1"
-    tput sgr0
-    if [ $# -eq 4 ]; then
-      length=${#1}
-      width=73
-      pad=$(( width - length ))
-      set_foreground=$(tput setaf "$3")
-      set_background=$(tput setab "$clrBlack")
-      echo -n "$set_background$set_foreground"
-      printf "%s" $(pad_string_with_stars "─" $pad)
-      tput sgr0
-    fi
-    printf "\n\r"
+    printf "\e[38;5;%sm\e[48;5;%sm%s\e[38;5;7m\e[48;5;0m" "$2" "$3" "$1"
 }
 
 pad_string_with_stars() {
@@ -182,7 +168,7 @@ pad_string_with_stars() {
 #######################################
 blueLog() {
   log="$1"
-  coloredLog "${log}" "$clrWhite" "$clrBlue"
+  coloredLog "${log}" "$clrWhite" "$clrBlue" && printf "\n\r"
 }
 
 #######################################
@@ -195,7 +181,7 @@ blueLog() {
 #######################################
 greenLog() {
   log="$1"
-  coloredLog "${log}" "$clrWhite" "$clrGreen"
+  coloredLog "${log}" "$clrWhite" "$clrGreen" && printf "\n\r"
 }
 
 #######################################
@@ -208,7 +194,7 @@ greenLog() {
 #######################################
 redLog() {
   log="$1"
-  coloredLog "${log}" "$clrRed" "$clrBlack"
+  coloredLog "${log}" "$clrRed" "$clrBlack" && printf "\n\r"
 }
 
 #######################################
@@ -219,7 +205,7 @@ redLog() {
 #   Writes log to standard out
 #######################################
 importantLog() {
-  coloredLog "$1" "$clrCyan" "$clrBlack"
+  coloredLog "$1" "$clrCyan" "$clrBlack" && printf "\n\r"
 }
 
 #################################################
@@ -364,7 +350,7 @@ coloredCsvTable() { #show csv file with header line in nice format
    if [ "${linefromXX}" = "1" ]; then linefromXX="2"; fi
    headers=$(head -1 $csvfile | sed 's/ /_/g' | awk -F, 'BEGIN {i=1} {while (i<=NF) {str=str substr($i,1,12)","; i++;}} END {print str}')
    importantLog "${csvfile}"
-   ! [ "${heading}" = "" ] && coloredLog "${heading}"
+   ! [ "${heading}" = "" ] && coloredLog "${heading}\n\r"
    if [ "${width}" = "" ]; then
      (echo "${headers}" && sed -n "${linefromXX},${linetoXX}p" "${csvfile}") \
         | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' \
@@ -570,11 +556,36 @@ printMenuHeading(){
 # Print the sub menu head. 
 # Arguments:
 #   $1: sub menu head description
+#   $2: optional: menu width
+#   $3: padding symbol
 # Outputs:
 #   The sub menu head to stdout
 #################################################
 printSubmenuHeading(){
-  coloredLog "$1" "$submenuFGClr" "$submenuBGClr"
+  $has_two_clms && local dfltwidth=$(( globalClmWidth * 2 + 3 ))
+  $has_two_clms || local dfltwidth=$(( globalClmWidth + 3 ))
+  local width="${2:-$dfltwidth}"
+  local symbol="${3:-"─"}"
+  local paddedline="$(r_pad "$1" "$width" "$symbol")"
+  coloredLog "$paddedline\n\r" "$submenuFGClr" "$submenuBGClr"
+}
+
+#################################################
+# Right pad text 
+# Arguments:
+#   $1: text
+#   $2: target width of line 
+#   $3: symbol for padding
+# Outputs:
+#   Padded line to stdout
+#################################################
+r_pad() {
+  local text=$1
+  local length=${#text}
+  local width=${2:-$length}
+  local paddedcount=$(( width - length ))
+  local printout="$text$(printf "%-${paddedcount}s" "" | tr " " "$symbol")"
+  printf "%s" "$printout"
 }
 
 quit () {
@@ -628,10 +639,9 @@ draw_rounded_square() {
     done
     border+="$top_right_corner"
 
-    formattedTop=$(tput setaf $clrWhite)$(tput setab $clrBlue)$(tput bold)$border$(tput sgr0)
     formattedMiddle=$(tput setaf $clrWhite)$(tput setab $clrBlue)$(tput bold)"$vertical_line "$(tput setaf $clrWhite)$(tput setab $clrBlue)$(tput bold)$text$(tput sgr0)$(tput setaf $clrWhite)$(tput setab $clrBlue)$(tput bold)" $vertical_line"$(tput sgr0)
 
-    formattedheading+=$(printf '%s\n\r' "$formattedTop")
+    formattedheading+=$(coloredLog "$border\n\r" 7 20)
     formattedheading+=$(printf '%s\n\r' "$formattedMiddle")
 
     border="$bottom_left_corner"
@@ -640,8 +650,7 @@ draw_rounded_square() {
     done
     border+="$bottom_right_corner"
 
-    formattedBottom=$(tput setaf $clrWhite)$(tput setab $clrBlue)$(tput bold)$border$(tput sgr0)
-    formattedheading+=$(printf '%s\n\r' "$formattedBottom")
+    formattedheading+=$(coloredLog "$border\n\r" 7 20)
 
     printf '%s' "$formattedheading"