diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index 7ac7c507..2f855667 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/.Floppies/STABLE.140.po b/.Floppies/STABLE.140.po index 7984b34b..f7f273f8 100644 Binary files a/.Floppies/STABLE.140.po and b/.Floppies/STABLE.140.po differ diff --git a/.Floppies/STABLE.32MB.po b/.Floppies/STABLE.32MB.po index 52e33d98..28f21c07 100644 Binary files a/.Floppies/STABLE.32MB.po and b/.Floppies/STABLE.32MB.po differ diff --git a/.Floppies/STABLE.800.po b/.Floppies/STABLE.800.po index ad79185a..f4550b85 100644 Binary files a/.Floppies/STABLE.800.po and b/.Floppies/STABLE.800.po differ diff --git a/ADMIN/a2osx.txt b/ADMIN/a2osx.txt index 94fe1e3b..d0b41bbe 100644 --- a/ADMIN/a2osx.txt +++ b/ADMIN/a2osx.txt @@ -4,6 +4,7 @@ AUTO 4,1 #!/bin/sh # # A2osX Admin Menu Test +echo -N "\f\e[12;32H\e[7mLoading Menu.." . fmenu call menu adminmenu MAN diff --git a/EXAMPLES/FMENU.txt b/EXAMPLES/FMENU.txt index bbb60949..3b105d6a 100644 --- a/EXAMPLES/FMENU.txt +++ b/EXAMPLES/FMENU.txt @@ -32,7 +32,7 @@ function processchoice { case 17 case 18 set select = $select - 10 - set choice = `sh -C "grep ${menu}:${select}: $menufile | cut -s ${sep} -f 4"` + set choice = `sh -C "grep ${menu}-${select}: $menufile | cut -s ${sep} -f 3"` break case 20 set choice = "Quit" @@ -48,9 +48,9 @@ function processchoice { set select = 99 end if [ $select -lt 9 ] - if [ $choice = "MENU" ] - set lm = $menu - set menu = `sh -C "grep ${menu}:${select}: $menufile | cut -s ${sep} -f 5"` + if [ $choice = "menu" ] + set lm = $menu + set menu = `sh -C "grep ${menu}-${select}: $menufile | cut -s ${sep} -f 4"` set select = 1 fi fi @@ -59,25 +59,16 @@ echo -N "." function loadmenu { set mc = 0 set lc = 0 - for i in `grep "${menu}:" $menufile` - echo $mc $lc $i - pause - if [ $lc -eq 0 ] - set mr = `sh -C "echo ${i} | cut -s ${sep} -f 3"` - echo $mc $lc $mr - pause - if [ $mr = "-" ] - set lc = $mc - 1 - else - set m${mc} = $mr - fi - set mc = $mc + 1 - fi +# echo \n\n\n\n\n\n +grep ${menu}- $menufile | cut -s ${sep} -f 2 +pause + for i in `sh -C "grep ${menu}- $menufile | cut -s ${sep} -f 2"` + if [ $i = "-" ];set lc = $mc - 1;fi + set m${mc} = $i + set mc = $mc + 1 next - if [ $lc -eq 0 ] - set lc = 8 - fi - set mc =;set mr = + if [ $lc -eq 0 ];set lc = 8;fi + set mc = } echo -N "." function getselect { diff --git a/EXAMPLES/MENU.DAT.txt b/EXAMPLES/MENU.DAT.txt index f1be9e75..6955c234 100644 --- a/EXAMPLES/MENU.DAT.txt +++ b/EXAMPLES/MENU.DAT.txt @@ -2,77 +2,77 @@ NEW PREFIX AUTO 4,1 menu:LINE:TEXT:ACTION:PREFIX:- -A:0:Master Menu:-:-:- -A:1:Administration Menu:menu:B:- -A:2:User Management:menu:C:- -A:3:Testing Subsystem Menu:menu:D:- -A:4:Make System Menu:menu:E:- -A:5:Extras Menu:menu:F:- -A:6:-:-:-:- -A:7:-:-:-:- -A:8:-:-:-:- -B:0:Administration Menu:-:-:- -B:1:Display Processes (ps):ps:-:- -B:2:Display Memory (mem):mem:-:- -B:3:Kernel Configuration (kconfig):kconfig:-:- -B:4:List Volumes Online:online:/MAKE/USR/SHARE/ADMIN/:- -B:5:User Management:menu:C:- -B:6:-:-:-:- -B:7:-:-:-:- -B:8:-:-:-:- -C:0:User Management:-:-:- -C:1:List Users:LISTUSERS:/MAKE/USR/SHARE/ADMIN/:- -C:2:Add User:ADDUSER:/MAKE/USR/SHARE/ADMIN/:- -C:3:Delete User:DELUSER:/MAKE/USR/SHARE/ADMIN/:- -C:4:Edit User Details:EDITUSER:/MAKE/USR/SHARE/ADMIN/:- -C:5:Change Password:PASSWORD:/MAKE/USR/SHARE/ADMIN/:- -C:6:-:-:-:- -C:7:-:-:-:- -C:8:-:-:-:- -D:0:Testing Subsystem Menu:-:-:- -D:1:Build Test Suite with Logging:BUILDTEST:/MAKE/USR/SHARE/TESTS/:- -D:2:Display Logs:LOG:/MAKE/USR/SHARE/TESTS/:- -D:3:Core Tests:CORETEST:/MAKE/USR/SHARE/TESTS/:- -D:4:Display Tests:DISPLAYTEST:/MAKE/USR/SHARE/TESTS/:- -D:5:Pathing Tests:PATHTEST:/MAKE/USR/SHARE/TESTS/:- -D:6:Internal Commands Tests:INTERNALTEST:/MAKE/USR/SHARE/TESTS/:- -D:7:External Commands Tests:EXTERNALTEST:/MAKE/USR/SHARE/TESTS/:- -D:8:-:-:-:- -E:0:Make System Menu:-:-:- -E:1:List Builds:-:-:- -E:2:Copy Latest Build:-:-:- -E:3:Delete a Build:-:-:- -E:4:Set Build Releases:-:-:- -E:5:Make Media:-:-:- -E:6:-:-:-:- -E:7:-:-:-:- -E:8:-:-:-:- -F:0:Extras Menu:-:-:- -F:1:Display A2osX Logo:LOGO:/MAKE/USR/SHARE/EXAMPLES/:- -F:2:Display A2osX License:LICENSE:/MAKE/USR/SHARE/EXAMPLES/:- -F:3:-:-:-:- -F:4:-:-:-:- -F:5:-:-:-:- -F:6:-:-:-:- -F:7:-:-:-:- -F:8:-:-:-:- -G:0:-:-:-:- -G:1:-:-:-:- -G:2:-:-:-:- -G:3:-:-:-:- -G:4:-:-:-:- -G:5:-:-:-:- -G:6:-:-:-:- -G:7:-:-:-:- -G:8:-:-:-:- -H:0:-:-:-:- -H:1:-:-:-:- -H:2:-:-:-:- -H:3:-:-:-:- -H:4:-:-:-:- -H:5:-:-:-:- -H:6:-:-:-:- -H:7:-:-:-:- -H:8:-:-:-:- +A-0:Master Menu:-:-:- +A-1:Administration Menu:menu:B:- +A-2:User Management:menu:C:- +A-3:Testing Subsystem Menu:menu:D:- +A-4:Make System Menu:menu:E:- +A-5:Extras Menu:menu:F:- +A-6:-:-:-:- +A-7:-:-:-:- +A-8:-:-:-:- +B-0:Administration Menu:-:-:- +B-1:Display Processes:ps:-:- +B-2:Display Memory:mem:-:- +B-3:Kernel Configuration:kconfig:-:- +B-4:List Volumes Online:online:/MAKE/USR/SHARE/ADMIN/:- +B-5:User Management:menu:C:- +B-6:-:-:-:- +B-7:-:-:-:- +B-8:-:-:-:- +C-0:User Management:-:-:- +C-1:List Users:listusers:/MAKE/USR/SHARE/ADMIN/:- +C-2:Add User:adduser:/MAKE/USR/SHARE/ADMIN/:- +C-3:Delete User:deluser:/MAKE/USR/SHARE/ADMIN/:- +C-4:Edit User Details:edituser:/MAKE/USR/SHARE/ADMIN/:- +C-5:Change Password:password:/MAKE/USR/SHARE/ADMIN/:- +C-6:-:-:-:- +C-7:-:-:-:- +C-8:-:-:-:- +D-0:Testing Subsystem Menu:-:-:- +D-1:Build Test Suite with Logging:buildtest:/MAKE/USR/SHARE/TESTS/:- +D-2:Display Logs:log:/MAKE/USR/SHARE/TESTS/:- +D-3:Core Tests:coretest:/MAKE/USR/SHARE/TESTS/:- +D-4:Display Tests:displaytest:/MAKE/USR/SHARE/TESTS/:- +D-5:Pathing Tests:pathtest:/MAKE/USR/SHARE/TESTS/:- +D-6:Internal Commands Tests:internaltest:/MAKE/USR/SHARE/TESTS/:- +D-7:External Commands Tests:externaltest:/MAKE/USR/SHARE/TESTS/:- +D-8:-:-:-:- +E-0:Make System Menu:-:-:- +E-1:List Builds:-:-:- +E-2:Copy Latest Build:-:-:- +E-3:Delete a Build:-:-:- +E-4:Set Build Releases:-:-:- +E-5:Make Media:-:-:- +E-6:-:-:-:- +E-7:-:-:-:- +E-8:-:-:-:- +F-0:Extras Menu:-:-:- +F-1:Display A2osX Logo:logo:/MAKE/USR/SHARE/EXAMPLES/:- +F-2:Display A2osX License:license:/MAKE/USR/SHARE/EXAMPLES/:- +F-3:-:-:-:- +F-4:-:-:-:- +F-5:-:-:-:- +F-6:-:-:-:- +F-7:-:-:-:- +F-8:-:-:-:- +G-0:-:-:-:- +G-1:-:-:-:- +G-2:-:-:-:- +G-3:-:-:-:- +G-4:-:-:-:- +G-5:-:-:-:- +G-6:-:-:-:- +G-7:-:-:-:- +G-8:-:-:-:- +H-0:-:-:-:- +H-1:-:-:-:- +H-2:-:-:-:- +H-3:-:-:-:- +H-4:-:-:-:- +H-5:-:-:-:- +H-6:-:-:-:- +H-7:-:-:-:- +H-8:-:-:-:- MAN TEXT /MAKE/USR/SHARE/ADMIN/adminmenu