diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index 572b63d2..4d2d0be7 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/.Floppies/MINI2CPPP.140.po b/.Floppies/MINI2CPPP.140.po index 2691c592..d34bc323 100644 Binary files a/.Floppies/MINI2CPPP.140.po and b/.Floppies/MINI2CPPP.140.po differ diff --git a/.Floppies/STABLE.140.po b/.Floppies/STABLE.140.po index 48d06e46..9db21980 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 490b8c39..29a86db1 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 28ee5f20..2fdcd0b3 100644 Binary files a/.Floppies/STABLE.800.po and b/.Floppies/STABLE.800.po differ diff --git a/ADMIN/update.txt b/ADMIN/update.txt index 78169e41..a07ae6bd 100644 --- a/ADMIN/update.txt +++ b/ADMIN/update.txt @@ -33,6 +33,7 @@ if [ -f ${BOOT}tmp/latest ] rm -q ${BOOT}tmp/latest fi httpget update.a2osx.net -U latest -o ${BOOT}tmp/latest > /dev/null 2> /dev/null +chtyp TXT ${BOOT}tmp/latest set RC = $? switch $RC case 0 @@ -71,6 +72,7 @@ if [ $UBLD -le $BUILD ] else echo "\nDownloading update...\n" httpget update.a2osx.net -U update.${UBLD} -o ${BOOT}tmp/update.${UBLD} > /dev/null 2> /dev/null + chtyp 0CF ${BOOT}tmp/update.${UBLD} set BSIZE = `stat -s ${BOOT}tmp/update.${UBLD}` if [ $BSIZE -ne $USIZE ] echo "\e[7mError\e[0m: Update did not completely download\n" @@ -85,9 +87,8 @@ else cp -q -y ${ROOT}sys/km/${km} ${ROOT}sys/${km} next echo "\nUpdating Version File...\n" - echo "SET OS = A2OSX" > ${BOOT}etc/version - echo "SET VER = 0.94" >> ${BOOT}etc/version - echo "SET BUILD = ${UBLD}" >> ${BOOT}etc/version + echo "# A2osX Build Version File" > ${BOOT}etc/version + echo "${UBLD}" >> ${BOOT}etc/version echo "\nUpdating Issue File...\n" echo > ${BOOT}etc/issue echo "Welcome to A2osX!" >> ${BOOT}etc/issue diff --git a/MAKE/ADDEXTRAS.txt b/MAKE/ADDEXTRAS.txt new file mode 100644 index 00000000..a2dcb4bb --- /dev/null +++ b/MAKE/ADDEXTRAS.txt @@ -0,0 +1,15 @@ +NEW + PREFIX +AUTO 4,1 +#!/bin/sh +# +# This script adds some extra files to full media. +cp /MAKE/assets/PRODOS242/BASIC.SYSTEM /FULLBOOT/bin/Basic +cp /MAKE/SCASM3.SYSTEM /FULLBOOT/bin/SC3 +cp /MAKE/assets/PRODOS242/COPYIIPLUS.8.4 /FULLBOOT/bin/CP2Plus +cp /MAKE/usr/share/adm/adm /FULLBOOT/bin/adm +cp /MAKE/usr/share/adm/help /FULLBOOT/bin/help +cp /MAKE/usr/share/adm/update /FULLBOOT/usr/share/adm/update +# +MAN +TEXT /MAKE/USR/SHARE/MAKE/addextras diff --git a/MAKE/FULLFILES.txt b/MAKE/FULLFILES.txt index 7aa0668e..5108e2d3 100644 --- a/MAKE/FULLFILES.txt +++ b/MAKE/FULLFILES.txt @@ -83,6 +83,7 @@ drv/ssc.i.drv drv/uther2.ai.drv drv/uthernet.drv drv/uthernet2.drv +etc/bbsd.conf etc/hostname etc/hosts etc/init @@ -90,6 +91,7 @@ etc/issue etc/motd etc/network etc/ppp.conf +etc/version inc/a2osx.i inc/applesoft.i inc/appletalk.i @@ -128,7 +130,7 @@ lib/libblkdev lib/libcifs lib/libpak lib/libtcpip -root/acostest.a +root/bbs.a root/GF root/helloworld.f root/mandelbrot.f @@ -136,8 +138,10 @@ root/nets root/nets2 root/netd root/netd2 +root/test.a root/tsh root/tcsh +sbin/bbsd sbin/cifsd sbin/getty sbin/gui diff --git a/MAKE/MAKEFULL.txt b/MAKE/MAKEFULL.txt index 5612ec71..cd904565 100644 --- a/MAKE/MAKEFULL.txt +++ b/MAKE/MAKEFULL.txt @@ -120,6 +120,8 @@ cp -Q -Y initboot /FULLBOOT/etc/init ECHO "Welcome to A2osX!" > /FULLBOOT/etc/issue ECHO >> /FULLBOOT/etc/issue ECHO $IM >> /FULLBOOT/etc/issue +echo "#A2osX Build Verion" > /FULLBOOT/etc/version +echo "${B}" >> /FULLBOOT/etc/version cp -Q tcpip.conf /FULLBOOT/etc/tcpip.conf cp -Q profile /FULLBOOT/root/profile IF [ $PDOS -eq 1 ] diff --git a/MAKE/MAKEFULL32.txt b/MAKE/MAKEFULL32.txt index 8f55f083..5d3f1e0c 100644 --- a/MAKE/MAKEFULL32.txt +++ b/MAKE/MAKEFULL32.txt @@ -105,6 +105,8 @@ cp -Q -Y initboot /FULLBOOT/etc/init ECHO "Welcome to A2osX!" > /FULLBOOT/etc/issue ECHO >> /FULLBOOT/etc/issue ECHO $IM >> /FULLBOOT/etc/issue +echo "#A2osX Build Verion" > /FULLBOOT/etc/version +echo "${B}" >> /FULLBOOT/etc/version cp -Q tcpip.conf /FULLBOOT/etc/tcpip.conf cp -Q profile /FULLBOOT/root/profile cp -q helloworld.s /FULLBOOT/root/helloworld.s diff --git a/MAKE/UPDATEFILES.txt b/MAKE/UPDATEFILES.txt index 743a1b2c..6a0f94e5 100644 --- a/MAKE/UPDATEFILES.txt +++ b/MAKE/UPDATEFILES.txt @@ -120,6 +120,7 @@ lib/libblkdev lib/libcifs lib/libpak lib/libtcpip +sbin/bbsd sbin/cifsd sbin/getty sbin/gui diff --git a/TESTS/BUILDTEST.txt b/TESTS/BUILDTEST.txt index f23151b5..355ab851 100644 --- a/TESTS/BUILDTEST.txt +++ b/TESTS/BUILDTEST.txt @@ -67,10 +67,10 @@ ECHO "\n----------------------------------------\n" >> ${Log} ECHO "\n Calling VTTEST\n" >> ${Log} ECHO "\n----------------------------------------\n" >> ${Log} . VTTEST -ECHO "\n----------------------------------------\n" >> ${Log} -ECHO "\n Calling CATTEST\n" >> ${Log} -ECHO "\n----------------------------------------\n" >> ${Log} -. CATTEST +#ECHO "\n----------------------------------------\n" >> ${Log} +#ECHO "\n Calling CATTEST\n" >> ${Log} +#ECHO "\n----------------------------------------\n" >> ${Log} +#. CATTEST ECHO "\n----------------------------------------\n" >> ${Log} ECHO "\n Calling ARGTEST\n" >> ${Log} ECHO "\n----------------------------------------\n" >> ${Log}