Merge pull request #69 from AtkinsSJ/await-builtin-outputs

Await stdio writes in all coreutils

src/puter-shell/coreutils/changelog.js

@@ -16,14 +16,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-// INCONST: called 'path' instead of 'path_' elsewhere
-import path_ from "path-browserify";
 import { SHELL_VERSIONS } from "../../meta/versions.js";
 
-function printVersion(ctx, version) {
-    ctx.externs.out.write(`\x1B[35;1m[v${version.v}]\x1B[0m\n`);
+async function printVersion(ctx, version) {
+    await ctx.externs.out.write(`\x1B[35;1m[v${version.v}]\x1B[0m\n`);
     for ( const change of version.changes ) {
-        ctx.externs.out.write(`\x1B[32;1m+\x1B[0m ${change}\n`);
+        await ctx.externs.out.write(`\x1B[32;1m+\x1B[0m ${change}\n`);
     }
 }
 
@@ -42,12 +40,12 @@ export default {
     },
     execute: async ctx => {
         if (ctx.locals.values.latest) {
-            printVersion(ctx, SHELL_VERSIONS[0]);
+            await printVersion(ctx, SHELL_VERSIONS[0]);
             return;
         }
 
         for ( const version of SHELL_VERSIONS.toReversed() ) {
-            printVersion(ctx, version);
+            await printVersion(ctx, version);
         }
     }
 };

src/puter-shell/coreutils/clear.js

@@ -26,6 +26,6 @@ export default {
         allowPositionals: false
     },
     execute: async ctx => {
-        ctx.externs.out.write('\x1B[H\x1B[2J');
+        await ctx.externs.out.write('\x1B[H\x1B[2J');
     }
 };

src/puter-shell/coreutils/cp.js

@@ -40,15 +40,15 @@ export default {
         const { filesystem } = ctx.platform;
 
         if ( positionals.length < 1 ) {
-            err.write('cp: missing file operand\n');
+            await err.write('cp: missing file operand\n');
             throw new Exit(1);
         }
 
         const srcRelPath = positionals.shift();
 
         if ( positionals.length < 1 ) {
             const aft = positionals[0];
-            err.write(`cp: missing destination file operand after '${aft}'\n`);
+            await err.write(`cp: missing destination file operand after '${aft}'\n`);
             throw new Exit(1);
         }
 
@@ -59,7 +59,7 @@ export default {
 
         const srcStat = await filesystem.stat(srcAbsPath);
         if ( srcStat && srcStat.is_dir && ! values.recursive ) {
-            err.write(`cp: -R not specified; skipping directory '${srcRelPath}'\n`);
+            await err.write(`cp: -R not specified; skipping directory '${srcRelPath}'\n`);
             throw new Exit(1);
         }
 

src/puter-shell/coreutils/ls.js

@@ -110,7 +110,7 @@ export default {
             ? [pwd] : positionals ;
 
         const showHeadings = paths.length > 1 ? async ({ i, path }) => {
-            if ( i !== 0 ) ctx.externs.out.write('\n');
+            if ( i !== 0 ) await ctx.externs.out.write('\n');
             await ctx.externs.out.write(path + ':\n');
         } : () => {};
 

src/puter-shell/coreutils/neofetch.js

@@ -89,7 +89,7 @@ export default {
         lines[15] += '\x1B[0m';
 
         for ( const line of lines ) {
-            ctx.externs.out.write(line + '\n');
+            await ctx.externs.out.write(line + '\n');
         }
     }
 }

src/puter-shell/coreutils/sample-data.js

@@ -36,7 +36,7 @@ export default {
         }
 
         console.log('before writing');
-        ctx.externs.out.write('Hello, World!\n');
+        await ctx.externs.out.write('Hello, World!\n');
         console.log('after writing');
     }
 }