diff --git a/.Docs/Media Guide.md b/.Docs/Media Guide.md index cbce13c1..0a16504c 100644 --- a/.Docs/Media Guide.md +++ b/.Docs/Media Guide.md @@ -1,6 +1,6 @@ # A2osX Media Guide -### Updated October 22, 2019 +### Updated October 31, 2019 We have changed the media set for A2osX. New A2osX Users should download the most current version as shown in the table below. **A new Release Candidate (RC) edition has been made available (highlighted below), you should choose one of the media options from this set.** The Bleed media are the primary images used by the developers to hold the most current version of the A2osX binaries (and a copy of the source, although of course GitHub is the primary source repository) and may be unstable. You should not use this media unless directed by the A2osX development team. @@ -9,8 +9,8 @@ We have changed the media set for A2osX. New A2osX Users should download the mo | Edition | Description | Build No | Date | | --- | --- | --- | --- | | RELEASE | This is a locked down set of media that will change infrequently, only upon a major update. | | * | -| **RC** | **This is a RELEASE candidate, if available, for the next coming major release. There should be very few RC releases before one of them becomes the actual RELEASE media. RC releases should be relatively bug free and feature complete (to the scope planned for that release).** | **1664** | **Oct-22-2019** | -| STABLE | Stable releases are significant updates over the last RELEASE but may not included in their own scope. STABLE releases will be made from BLEED builds that have no significant bugs, but may have documented issues that have not yet been resolved, especially in new features. **This will likely become RC shortly. Anyone with network cards, please download and test.** | **1675** | **Oct-26-2019** | +| **RC** | This is a RELEASE candidate, if available, for the next coming major release. There should be very few RC releases before one of them becomes the actual RELEASE media. RC releases should be relatively bug free and feature complete (to the scope planned for that release). | **1664** | Oct-22-2019 | +| **STABLE** | **Stable releases are significant updates over the last RELEASE but may not included in their own scope. STABLE releases will be made from BLEED builds that have no significant bugs, but may have documented issues that have not yet been resolved, especially in new features. This will likely become RC shortly.** | **1694** | **Oct-31-2019** | | BLEED| The media in this edition are very cutting edge, changing almost daily, particularly A2OSX.BUILD.po. This edition is targeted at core developers who are creating and maintaining A2osX. For most users, it is recommended that you use one of the other editions. | | * | * Note this is a new system of Editions and Disk Images. A2osX 0.93 will be the first Release that uses this new system. The first **RC** set of media are now available and are based on build No 1600. If no significant issues are found with **RC**, a set of **RELEASE** media will be made available based on this build (the RC media will then be removed until a 0.94 RC is ready). diff --git a/.Docs/Shell Developers Guide.md b/.Docs/Shell Developers Guide.md index dd172f3d..a7633723 100644 --- a/.Docs/Shell Developers Guide.md +++ b/.Docs/Shell Developers Guide.md @@ -64,6 +64,8 @@ SET SLEEP TIME +A note on arguments, for internal and external commands: When passing a command a series of arguments, you must include between each argument. In addition, if a command has an option that requires an argument, there must also be a space between the option and its argument. For example, when using the READ command which has the -S -P and -N options, the -P and -N options both require an argument so the full use of the command would be **READ -S -N 3 -P "My Prompt" AVAR**. Do not use -N3 as you might in Linux or DOS as you will generate a Syntax Error and the command will fail to execute. + #### Redirection diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index 97e5108f..d1900cb7 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/.Floppies/DEBUG.po b/.Floppies/DEBUG.po index 44e9cade..523bae64 100644 Binary files a/.Floppies/DEBUG.po and b/.Floppies/DEBUG.po differ diff --git a/.Floppies/STABLE.140.po b/.Floppies/STABLE.140.po index 8d82a03b..0affcb13 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 ba77788c..ca3022da 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 17829ef4..1d960743 100644 Binary files a/.Floppies/STABLE.800.po and b/.Floppies/STABLE.800.po differ diff --git a/.Floppies/TDBOOT.po b/.Floppies/TDBOOT.po index 28b5c9e5..01f8534e 100644 Binary files a/.Floppies/TDBOOT.po and b/.Floppies/TDBOOT.po differ diff --git a/MAKE/COPYBUILD.txt b/MAKE/COPYBUILD.txt new file mode 100644 index 00000000..5911ac08 --- /dev/null +++ b/MAKE/COPYBUILD.txt @@ -0,0 +1,56 @@ +NEW + PREFIX +AUTO 4,1 +#!/BIN/SH +# +# This script copies the latest BUILD (A2OSX.BUILD) to MAKE (A2OSX.MAKE) +# and then verifies/corrects that files are in the right locations to +# be used by other MAKE processes such as those for making disk images +# +. MAKEFUNCS +CALL CS +CALL TBOX " New BUILD File Copier" +# Check for BUILD and MAKE online +IF [ -D "/A2OSX.BUILD" ] +ELSE + ECHO "A2OSX.BUILD is not online or available." + ECHO + ECHO "Exiting" + EXIT +FI +IF [ -D "/MAKE" ] +ELSE + ECHO "A2OSX.MAKE is not online or available." + ECHO + ECHO "Exiting" + EXIT +FI +CALL PRINTXY 8 0 "BUILD and MAKE volumes found." +ECHO "\n" +READ -P "WHICH BUILD NO: " B +IF [ -Z $B ] + ECHO "You did not enter any response." + ECHO + ECHO "Exiting" + EXIT +FI +SET SRC = "/MAKE/BUILDS/BUILD${B}" +IF [ -D ${SRC} ] + ECHO "\n\nFound Existing BUILD ${B}\n" + ECHO + ECHO "Exiting" + EXIT +ELSE + ECHO "\n\nNo BUILD ${B} found." + ECHO + ECHO "Creating Directory" +FI +MD /MAKE/BUILDS/BUILD${B} +ECHO "\nCopying Files..." +CP -Q -R /A2OSX.BUILD/* /MAKE/BUILDS/BUILD${B} +ECHO "\nBUILD $B Copied!" +ECHO "PREFIX BUILDS/BUILD${B}" > /MAKE/BLEED +ECHO "-A2OSX.SYSTEM" >> /MAKE/BLEED +ECHO "BLEED file updated! Process Complete. Exiting.\n" +MAN +TEXT /MAKE/USR/SHARE/MAKE/COPYBUILD diff --git a/MAKE/FULLFILES.txt b/MAKE/FULLFILES.txt index 942ef07e..6f060f56 100644 --- a/MAKE/FULLFILES.txt +++ b/MAKE/FULLFILES.txt @@ -63,8 +63,8 @@ SBIN/LOGIN SBIN/NETWORKD SBIN/TELNETD SYS/KERNEL -SYS/KM.NSC SYS/KM/KM.APPLETALK +SYS/KM/KM.NSC SYS/KM/KM.RAMWORKS SYS/KM/KM.VSDRIVE MAN diff --git a/MAKE/MAKEFULL.txt b/MAKE/MAKEFULL.txt index 6fce2c13..c7575fea 100644 --- a/MAKE/MAKEFULL.txt +++ b/MAKE/MAKEFULL.txt @@ -80,7 +80,7 @@ MD /FULLBOOT/TMP MD /FULLBOOT/VAR MD /FULLBOOT/VAR/LOG ECHO "Copying Files..." -FOR FILE IN (A2OSXFILES) +FOR FILE IN (FULLFILES) CP -Q ${SRC}/${FILE} /FULLBOOT/${FILE} NEXT CP -Q -Y /MAKE/ASSETS/PDOS203TC/PRODOS /FULLBOOT diff --git a/MAKE/MAKEFULL32.txt b/MAKE/MAKEFULL32.txt index e456b928..2846ad1f 100644 --- a/MAKE/MAKEFULL32.txt +++ b/MAKE/MAKEFULL32.txt @@ -80,7 +80,7 @@ MD /FULLBOOT/TMP MD /FULLBOOT/VAR MD /FULLBOOT/VAR/LOG ECHO "Copying Files..." -FOR FILE IN (A2OSXFILES) +FOR FILE IN (FULLFILES) CP -Q ${SRC}/${FILE} /FULLBOOT/${FILE} NEXT CP -Q -Y /MAKE/ASSETS/PDOS203TC/PRODOS /FULLBOOT diff --git a/MAKE/MAKETD.txt b/MAKE/MAKETD.txt index ca4cbaf8..2e71389c 100644 --- a/MAKE/MAKETD.txt +++ b/MAKE/MAKETD.txt @@ -80,7 +80,7 @@ MD /TDBOOT/TMP MD /TDBOOT/VAR MD /TDBOOT/VAR/LOG ECHO "Copying Files..." -FOR FILE IN (A2OSXFILES) +FOR FILE IN (FULLFILES) CP -Q ${SRC}/${FILE} /TDBOOT/${FILE} NEXT CP -Q -Y /MAKE/ASSETS/PDOS203TC/PRODOS /TDBOOT diff --git a/MAKE/MINIFILES.txt b/MAKE/MINIFILES.txt index 1cba4bae..482ccd19 100644 --- a/MAKE/MINIFILES.txt +++ b/MAKE/MINIFILES.txt @@ -46,6 +46,5 @@ SBIN/LOGIN SBIN/NETWORKD SBIN/TELNETD SYS/KERNEL -SYS/KM.NSC MAN TEXT /MAKE/USR/SHARE/MAKE/MINIFILES diff --git a/README.md b/README.md index 91e2af71..b8fe6594 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ Consult the **[documentation](#documentation)** section below to find other reso ## News... +**2019-10-31** - Media have been updated based on Build 1694. This version fixes issues with Piping of commands, adds new READ functionality. Please note, KM.NSC is no longer loaded by default on any media. If you have a No Slot Clock in your system, you should move the file KM.NSC from ./SYS/KM into ./SYS which will make it load on boot. + **2019-10-26** - Starting with Build 1675, the SH(ell) command **TIME** has been removed and the **DATE** command will now return both the Date and Time. Additionally, if DATE command has been updated to support options for returning formatted strings with just the portions of the date and time you desire. Consult the Shell Developers Guide for syntax. **2019-10-24** - Created STABLE images with Build 1669 with improvements to TCP networking. There is also a new DEBUG 140k disk image. See the media guide for more info. diff --git a/TESTS/READTEST.txt b/TESTS/READTEST.txt index 5918e28a..1f988e02 100644 --- a/TESTS/READTEST.txt +++ b/TESTS/READTEST.txt @@ -2,10 +2,23 @@ NEW PREFIX AUTO 4,1 #!/BIN/SH -ECHO Read Test +ECHO "\f Read Tests\n" ECHO "Current Value of TVar is ${TVar}" +ECHO "\nRead -P Prompt Test\n" READ -P "Enter your name: " TVar -Echo "New TVar is ${TVar} " -Echo "End Test" +Echo "\nNew TVar is ${TVar}\n" +Echo "Read -S Supress Echo/Password Input Test\n" +READ -S -P "Enter Password: " TVar +Echo "\nNew TVar is ${TVar}\n" +ECHO "Read -N 3 Limit Input Test\n" +READ -N 3 -P "Enter 3 chars: " TVar +Echo "\nNew TVar is ${TVar}\n" +ECHO "Read -N 1 Limit Input Test\n" +READ -N 1 -P "Enter 1 chars: " TVar +Echo "\nNew TVar is ${TVar}\n" +ECHO "Read -N 0 Limit Input Test\n" +READ -N 0 -P "Enter 1 chars: " TVar +Echo "\nNew TVar is ${TVar}\n" +Echo "\nEnd Test" MAN TEXT /MAKE/USR/SHARE/TESTS/READTEST