diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index 360a5635..72f93ec7 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/EXAMPLES/TESTFUNCS.txt b/EXAMPLES/TESTFUNCS.txt index 255eb8f2..32601fea 100644 --- a/EXAMPLES/TESTFUNCS.txt +++ b/EXAMPLES/TESTFUNCS.txt @@ -1,21 +1,73 @@ NEW PREFIX AUTO 4,1 -#!/BIN/SH +#!/bin/sh # # This script tests the standard functions defined in MAKEFUNCS # that are used by multiple MAKE scripts # # Load Functions File # -. MAKEFUNCS +#. MAKEFUNCS +# This script defines standard functions used by multiple scripts +# Clear Screen Function +FUNCTION CS { + ECHO \f +} +# Title Box Function +# CALL TBOX Str_Title +FUNCTION TBOX { + ECHO -N "\e[1;20H" + ECHO "\e[7m \e[0m" + SET LINE = 2 + WHILE [ $LINE -NE 5 ] + ECHO -N "\e[${LINE};20H" + ECHO "\e[7m \e[0m \e[7m \e[0m" + SET LINE = $LINE + 1 + LOOP + ECHO -N "\e[5;20H" + ECHO "\e[7m \e[0m" + ECHO -N "\e[3;22H $1" +} +# Print Inverse +FUNCTION INVERSE { + ECHO -N "\e[7m$1\e[0m" +} +# Print at Screen Location Function +# CALL PRINTXY Num_Row Num_Column Str_String +FUNCTION PRINTXY { + ECHO -N "\e[$1;$2H$3" +} +# Print Inverse At X Y +# CALL INVERSEXY Row Col String +FUNCTION INVERSEXY { + ECHO -N "\e[$1;$2H\e[7m$3\e[0m" +} +# STATUSLINE Function +# CALL STATUSLINE Str_Message +FUNCTION STATUSLINE { + ECHO -N "\e[24;0H\e[7m " + ECHO -N " \e[0m" + ECHO -N "\e[24;2H\e[7m$1\e[0m" + ECHO -N "\e[24;68H\e[7m" +# TIME | CUT -M 10 -N 20 + # SET DTIME = `TIME | CUT -M 10 -N 20`: ECHO -N ${DTIME} + ECHO -N "\e[0m" +} +# YesNoKeyPress Function +# CALL YNKP Returns 1(Y) or 0 (N) +FUNCTION YNKP { + ECHO Not yet implemented +} +# Get String At X Y Function +# CALL GETXY Num_Row Num_Column Num_Length +FUNCTION GETXY { + ECHO Not yet implemented +} # # Test CS (ClearScreen Function) # CALL CS -ECHO $? -PAUSE - CALL TBOX "This is the Title" CALL STATUSLINE "Loading Functions..." CALL PRINTXY 10 10 "Hello World at 10 10" @@ -27,4 +79,4 @@ CALL INVERSEXY 15 15 "Inverse Now at 15 15" CALL PRINTXY 18 1 " " ECHO MAN -TEXT /MAKE/USR/SHARE/MAKE/TESTFUNCS +TEXT /MAKE/USR/SHARE/MAKE/TESTFUNCS2 diff --git a/MAKE/FULLFILES.txt b/MAKE/FULLFILES.txt index 70276b7a..9ac1fd80 100644 --- a/MAKE/FULLFILES.txt +++ b/MAKE/FULLFILES.txt @@ -16,6 +16,7 @@ bin/chmod bin/chtyp bin/cmp bin/cp +bin/csh bin/cut bin/dnsinfo bin/edit @@ -61,16 +62,16 @@ etc/init etc/issue etc/motd etc/network -INC/A2OSX.I -INC/IO.I -INC/LIBPAK.I -INC/LIBTCPIP.I -INC/MACROS.I -INC/MLI.E.I -INC/MLI.I -INC/MONITOR.I -INC/NET.HTTP.I -INC/PAK.I +inc/a2osx.i +inc/io.i +inc/libpak.i +inc/libtcpip.i +inc/macros.i +inc/mli.e.i +inc/mli.i +inc/monitor.i +inc/net.http.i +inc/pak.i lib/libblkdev lib/libpak lib/libtcpip diff --git a/MAKE/MAKEFULL32.txt b/MAKE/MAKEFULL32.txt index 21704734..17373247 100644 --- a/MAKE/MAKEFULL32.txt +++ b/MAKE/MAKEFULL32.txt @@ -71,6 +71,7 @@ ECHO "Making Directory Structure..." md /fullboot/bin md /fullboot/drv md /fullboot/etc +md /fullboot/inc md /fullboot/lib md /fullboot/root md /fullboot/sbin @@ -82,9 +83,10 @@ md /fullboot/usr/share md /fullboot/usr/share/extras md /fullboot/var md /fullboot/var/log +md /fullboot/var/www ECHO "Copying Files..." FOR FILE IN (fullfiles) - cp -Q ${SRC}/${FILE} /fullboot/${FILE} + cp ${SRC}/${FILE} /fullboot/${FILE} NEXT cp -Q -Y ${SRC}/PRODOS.FX /fullboot/ProDOS cp -Q -Y ${SRC}/PRODOS.FX /fullboot/usr/share/extras diff --git a/TESTS/CURSORTEST.txt b/TESTS/CURSORTEST.txt index 83464f08..48538ae0 100644 --- a/TESTS/CURSORTEST.txt +++ b/TESTS/CURSORTEST.txt @@ -1,7 +1,7 @@ NEW PREFIX AUTO 4,1 -#!/BIN/SH +#!/bin/sh # This script tests various cursor related commands # Clear Screen Function FUNCTION CS {