diff --git a/.Docs/Shell Developers Guide.md b/.Docs/Shell Developers Guide.md index 4299130f..1970f8f1 100644 --- a/.Docs/Shell Developers Guide.md +++ b/.Docs/Shell Developers Guide.md @@ -63,7 +63,8 @@ As briefly discussed above, almost all commands take and most even require an ar #### \ -The shell features a lot of built-in checks and comparisons called \ throughout this guide. This particular form of an argument is used exclusively by the **IF** and **WHILE** commands where the \ is evaluated and result is used to control program flow with in the defined **IF-ELSE-FI** or **WHILE-LOOP** block. All conditions must be encloded with in brackets **[]**. In addition to the capabilities found in the extensive list of checks and comparisons listed below, conditional execution can be enhanced by negating with an ! in front of a condition and/or compounding with AND and OR between two or more conditions. The following scripts show examples of the possible conditions you can use while writing your own scripts. +The shell features a lot of built-in checks and comparisons called \ throughout this guide. This particular form of an argument is used exclusively by the **IF** and **WHILE** commands where the \ is evaluated and result is used to control program flow with in the defined **IF-ELSE-FI** or **WHILE-LOOP** block. All conditions must be encloded with in brackets **[]**. In addition to the capabilities found in the extensive list of checks and comparisons listed below, conditional execution can be enhanced by negating with an ! in front of a condition and/or compounding with AND and OR between two or more conditions. The following scripts show examples of the possible conditions + can use while writing your own scripts. > Note: The examples below make use of the **;** directive which allows you to put multiple statements on one line. So for example diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index fcdebfdc..d73bc12f 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/TESTS/BADSHTEST.txt b/TESTS/BADSHTEST.txt index 19acef04..66a44c20 100644 --- a/TESTS/BADSHTEST.txt +++ b/TESTS/BADSHTEST.txt @@ -12,7 +12,7 @@ echo "\n\nThis script tests that the A2osX Shell (SH)" echo "correctly tests that scripts contain the correct" echo "shell script header #!:/bin/sh" echo -BADSCRIPT 2> /DEV/NULL +BADSCRIPT 2> /dev/null SET R = $? IF [ $R -EQ 118 ] IF [ -N $Log ] diff --git a/TESTS/BUILDTEST.txt b/TESTS/BUILDTEST.txt index f23151b5..87feb462 100644 --- a/TESTS/BUILDTEST.txt +++ b/TESTS/BUILDTEST.txt @@ -100,6 +100,8 @@ ECHO "\n Calling IFNUMTEST\n" >> ${Log} ECHO "\n----------------------------------------\n" >> ${Log} . IFNUMTEST ECHO "\n----------------------------------------\n" >> ${Log} +MEM +PAUSE ECHO "\n Calling IFANDORTEST\n" >> ${Log} ECHO "\n----------------------------------------\n" >> ${Log} . IFANDORTEST diff --git a/TESTS/IFNUMTEST.txt b/TESTS/IFNUMTEST.txt index 4fee8e59..4f4cd2d9 100644 --- a/TESTS/IFNUMTEST.txt +++ b/TESTS/IFNUMTEST.txt @@ -229,8 +229,8 @@ ELSE SET F = $F + 1 FI FI -# Fifteenth Test Dec Var to Constant Int -SET ABC = 1234.4321 +# Fifteenth Test Int Var to Constant Int +SET ABC = 1234 SET T = $T + 1 IF [ $ABC -EQ 1234 ] Echo " Test 15 Dec Var to Int : True : PASSED"