@@ -104,8 +104,8 @@ menuItem () {
104104# ################################################
105105menuItemClm () {
106106 clmLocalWidth=${globalClmWidth:= 45}
107- menudatamap+=(" $1 $delimiter $2 $delimiter $3 $delimiter$actualsubmenuname$delimiter$actualmenu$delimiter1 " )
108- menudatamap+=(" $4 $delimiter $5 $delimiter $6 $delimiter$actualsubmenuname$delimiter$actualmenu$delimiter2 " )
107+ menudatamap+=(" $1 $delimiter $2 $delimiter $3 $delimiter$actualsubmenuname$delimiter$actualmenu ${delimiter} 1 " )
108+ menudatamap+=(" $4 $delimiter $5 $delimiter $6 $delimiter$actualsubmenuname$delimiter$actualmenu ${delimiter} 2 " )
109109 ${immediateMode} && printMenuItemClm " $1 " " $2 " " $4 " " $5 "
110110}
111111
@@ -426,7 +426,12 @@ generateMenu () {
426426 OLD_IFS=$IFS
427427 local previoussubmenu previouscolumn submenucount;
428428 submenucount=0
429+ skipnext=false
429430 for (( index= 0 ; index< ${# menudatamap[@]} ; index++ )) ; do
431+ if [ " $skipnext " = " true" ]; then
432+ skipnext=false
433+ continue
434+ fi
430435 IFS=" $delimiter " read -r key description action submenu menu column <<< " ${menudatamap[index]}"
431436 IFS=" $delimiter " read -r nextkey nextdescription nextaction nextsubmenu nextmenu nextcolumn <<< " ${menudatamap[((index+1))]}"
432437 if [ " $index " -eq " 0" ]; then printMenuHeading " $menu " && echo ; fi
@@ -436,9 +441,10 @@ generateMenu () {
436441 submenucount=$(( submenucount+ 1 )) ;
437442 fi
438443 if [ " $(( nextcolumn)) " -eq " $(( column + 1 )) " ]; then
439- printMenuItemClm " $key " " $description " " $action " " $nextkey " " $nextdescription " " $nextaction "
444+ printMenuItemClm " $key " " $description " " $nextkey " " $nextdescription "
445+ skipnext=true
440446 else
441- printMenuItem " $key " " $description " " $action "
447+ printMenuItem " $key " " $description "
442448 fi
443449 previoussubmenu=" $submenu "
444450 done
@@ -543,12 +549,6 @@ printSubmenuHeading(){
543549 coloredLog " $1 " " $submenuFGClr " " $submenuBGClr "
544550}
545551
546- printLogo () {
547- echo " ╭───────────────────╮"
548- echo " │ EasyKey.shellmenu │"
549- echo " ╰───────────────────╯"
550- }
551-
552552quit () {
553553 echo " bye bye, homie!"
554554 nowaitonexit
0 commit comments