feat: apt command

softvisio-node · Mar 26, 2024 · 21a57b8 · 21a57b8
1 parent 3fa17d3
commit 21a57b8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/bin/softvisio-cli.js b/bin/softvisio-cli.js
@@ -77,4 +77,18 @@ const spec = {
 
 const cli = await CLI.parse( spec );
 
-await new cli.module().run();
+try {
+    var res = result.try( await new cli.module().run(), { "allowUndefined": true } );
+}
+catch ( e ) {
+    res = result.catch( e, { "log": false } );
+}
+
+if ( res.ok ) {
+    process.exit( 0 );
+}
+else {
+    console.log( res + "" );
+
+    process.exit( 1 );
+}
diff --git a/lib/commands/apt/build-base-images.js b/lib/commands/apt/build-base-images.js
@@ -22,9 +22,7 @@ export default class extends Command {
 
     // public
     async run () {
-        const rootPackage = this._findRootPackage();
-
-        if ( !rootPackage ) this._throwError( `Unable to find root package` );
+        if ( !this.root ) return result( [ 5 - 0, `Unable to find root package` ] );
 
         var res;
 
@@ -51,7 +49,7 @@ export default class extends Command {
                 ],
                 {
                     "stdio": "inherit",
-                    "cwd": this.resources + "/base-images",
+                    "cwd": this.root + "/base-images",
                 }
             );
             if ( !res.ok ) return res;

diff --git a/lib/commands/apt/command.js b/lib/commands/apt/command.js
@@ -2,39 +2,43 @@ import Command from "#lib/command";
 import "#core/result";
 import { readConfig } from "#core/config";
 import childProcess from "node:child_process";
-import env from "#core/env";
-import Git from "#core/api/git";
 
 export default class extends Command {
+    #rootPackage;
     #config;
     #codenames;
-    #git;
+
+    constructor () {
+        super();
+
+        this.#rootPackage = this._findRootPackage();
+    }
 
     // properties
     get root () {
-        return env.root;
+        return this.#rootPackage?.root;
     }
 
-    get repository () {
-        return this.root;
+    // XXX
+    get dists () {
+        return this.root + "/dists";
     }
 
+    // XXX
     get resources () {
         return this.root + "/resources";
     }
 
     get config () {
         if ( !this.#config ) {
-            this.#config = readConfig( this.resources + "/config.yaml" );
+            this.#config = readConfig( this.root + "/config.yaml" );
         }
 
         return this.#config;
     }
 
     get git () {
-        this.#git ??= new Git( this.repository );
-
-        return this.#git;
+        return this.#rootPackage.git;
     }
 
     get repositoryId () {