@altronix/cli 0.7.17 → 0.7.19

package/dist/build.js

@@ -353,14 +353,15 @@ function emulateBytePages(board) {
         board.startsWith('netway5pq') ||
         board.startsWith('oa2b'));
 }
-function extraAppConfs(extraConfs) {
+function extraAppConfs(extraConfs, config) {
     const key = process.env['ALTRONIX_RELEASE_KEY'];
     if (!key)
         throw new Error('missing ALTRONIX_RELEASE_KEY from environment');
     const extraConfsData = [
         `CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="${key}"`,
         `CONFIG_BOOTLOADER_MCUBOOT=y`,
-        `CONFIG_ATX_UPDATE_ENABLE=y`
+        `CONFIG_ATX_UPDATE_ENABLE=y`,
+        `CONFIG_ATX_CONFIG="${config}"`
     ].join('\r\n');
     return from(fs.promises.writeFile(extraConfs, extraConfsData));
 }
@@ -474,7 +475,7 @@ export async function build() {
     const wasm$ = buildWasm ? from(await Promise.all(wasm)) : EMPTY;
     // Handle all the preliminary stuff before building
     const ready$ = concat(merge(apps$.pipe(mergeMap(({ installDir: s, binaryDir: b }) => from([s, b]))), boot$.pipe(mergeMap(({ installDir: s, binaryDir: b }) => from([s, b]))), wasm$.pipe(map(({ installDir }) => installDir))).pipe(toArray(), mergeMap((arr) => from([...new Set(arr)])), // dedupe
-    clean(this.opts()['yes']), mkdir()), apps$.pipe(mergeMap(({ binaryDir }) => extraAppConfs(path.join(binaryDir, extraAppConfFile)))), boot$.pipe(mergeMap(({ board, binaryDir }) => extraBootConfs(board, path.join(binaryDir, extraBootConfFile)))), wasm$.pipe(mergeMap(seedle)), wasm$.pipe(mergeMap(({ files, cddl: dest }) => concatFiles(files, dest)))).pipe(last(), share());
+    clean(this.opts()['yes']), mkdir()), apps$.pipe(mergeMap(({ binaryDir, config }) => extraAppConfs(path.join(binaryDir, extraAppConfFile), config))), boot$.pipe(mergeMap(({ board, binaryDir }) => extraBootConfs(board, path.join(binaryDir, extraBootConfFile)))), wasm$.pipe(mergeMap(seedle)), wasm$.pipe(mergeMap(({ files, cddl: dest }) => concatFiles(files, dest)))).pipe(last(), share());
     // Get an array of every build item.
     const items$ = merge(apps$.pipe(map(westItem)), boot$.pipe(map(westItem)), wasm$.pipe(map(cmakeItem))).pipe(toArray());
     // Run build commands for all bootloaders, applications and wasm concurrently

package/dist/progress.ui.js

@@ -10,14 +10,19 @@ export default function Progress({ total, response$, onComplete }) {
     return (React.createElement(Box, null,
         React.createElement(Box, null,
             React.createElement(Text, null, "["),
-            new Array(progress).fill(0).map((_, idx) => (React.createElement(Text, { key: idx }, "#"))),
-            new Array(empty).fill(0).map((_, idx) => (React.createElement(Text, { key: idx }, "-"))),
+            progress > 0 && new Array(progress).fill(0).map(mapper('#')),
+            empty > 0 && new Array(empty).fill(0).map(mapper('-')),
             React.createElement(Text, null, "]")),
         React.createElement(Box, { marginLeft: 1 },
             React.createElement(Text, null,
-                Math.ceil((100 * progress) / width),
+                Math.min(Math.ceil((100 * progress) / width), 100),
                 "%"))));
 }
+function mapper(char) {
+    return function (_item, idx) {
+        return React.createElement(Text, { key: idx }, char);
+    };
+}
 function useProgress(obs$, total, width, onComplete) {
     const [progress, setProgress] = useState([0, width]);
     useLayoutEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.7.17",
+  "version": "0.7.19",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -22,8 +22,8 @@
     "react": "^18.2.0",
     "rxjs": "^7.8.1",
     "winston": "^3.13.0",
-    "@altronix/device": "0.7.0",
-    "@altronix/zdk": "0.7.1"
+    "@altronix/device": "0.7.1",
+    "@altronix/zdk": "0.7.2"
   },
   "devDependencies": {
     "@sindresorhus/tsconfig": "^3.0.1",