penguins-eggs 9.0.35 → 9.1.11

package/lib/commands/wardrobe/list.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+// libraries
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+/**
+ *
+ */
+class List extends core_1.Command {
+    async run() {
+        const { args, flags } = await this.parse(List);
+        let verbose = false;
+        if (flags.verbose) {
+            verbose = true;
+        }
+        const echo = utils_1.default.setEcho(verbose);
+        utils_1.default.titles(this.id + ' ' + this.argv);
+        /**
+        * wardobe
+        */
+        let wardrobe = await utils_1.default.wardrobe();
+        if (this.argv['0'] !== undefined) {
+            wardrobe = this.argv['0'];
+        }
+        wardrobe = `${path_1.default.resolve(process.cwd(), wardrobe)}/`;
+        if (!fs_1.default.existsSync(wardrobe)) {
+            utils_1.default.warning(`wardrobe: ${wardrobe} not found!`);
+            process.exit();
+        }
+        console.log(chalk_1.default.green(`wardrobe: `) + wardrobe);
+        console.log();
+        /**
+        * costumes
+        */
+        const costumes = fs_1.default.readdirSync(`${wardrobe}costumes/`);
+        console.log(chalk_1.default.green(`costumes: `));
+        costumes.forEach(costume => {
+            if (fs_1.default.existsSync(`${wardrobe}costumes/${costume}/index.yml`)) {
+                const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}costumes/${costume}/index.yml`, 'utf-8'));
+                console.log(chalk_1.default.cyan(costume) + ': ' + materials.description);
+            }
+        });
+        console.log();
+        /**
+         * accessories
+         */
+        const accessories = fs_1.default.readdirSync(`${wardrobe}/accessories/`);
+        console.log(chalk_1.default.green(`accessories: `));
+        accessories.forEach(accessory => {
+            if (fs_1.default.existsSync(`${wardrobe}/accessories/${accessory}/index.yml`)) {
+                const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/accessories/${accessory}/index.yml`, 'utf-8'));
+                console.log(chalk_1.default.cyan(accessory) + ': ' + materials.description);
+            }
+        });
+        console.log();
+        /**
+         * servers
+         */
+        const servers = fs_1.default.readdirSync(`${wardrobe}/servers/`);
+        console.log(chalk_1.default.green(`servers: `));
+        servers.forEach(server => {
+            if (fs_1.default.existsSync(`${wardrobe}/servers/${server}/index.yml`)) {
+                const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/servers/${server}/index.yml`, 'utf-8'));
+                console.log(chalk_1.default.cyan(server) + ': ' + materials.description);
+            }
+        });
+        console.log();
+    }
+}
+exports.default = List;
+List.description = 'list costumes and accessoires in wardrobe';
+List.args = [{ name: 'wardrobe', description: 'wardrobe', required: false }];
+List.flags = {
+    verbose: core_1.Flags.boolean({ char: 'v' }),
+    help: core_1.Flags.help({ char: 'h' })
+};

package/lib/commands/wardrobe/show.d.ts

@@ -0,0 +1,19 @@
+import { Command } from '@oclif/core';
+/**
+ *
+ */
+export default class Show extends Command {
+    static description: string;
+    static args: {
+        name: string;
+        description: string;
+        required: boolean;
+    }[];
+    static flags: {
+        wardrobe: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
+    };
+    run(): Promise<void>;
+}

package/lib/commands/wardrobe/show.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+// libraries
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+/**
+ *
+ */
+class Show extends core_1.Command {
+    async run() {
+        const { args, flags } = await this.parse(Show);
+        let verbose = flags.verbose;
+        let json = flags.json;
+        const echo = utils_1.default.setEcho(verbose);
+        utils_1.default.titles(this.id + ' ' + this.argv);
+        let wardrobe = await utils_1.default.wardrobe();
+        if (flags.wardrobe !== undefined) {
+            wardrobe = flags.wardrobe;
+        }
+        wardrobe = `${path_1.default.resolve(process.cwd(), wardrobe)}/`;
+        if (!fs_1.default.existsSync(wardrobe)) {
+            utils_1.default.warning(`wardrobe: ${wardrobe} not found!`);
+            process.exit();
+        }
+        console.log(chalk_1.default.green(`wardrobe: `) + wardrobe);
+        /**
+         * costume
+         */
+        let costume = 'costumes/colibri';
+        if (this.argv['0'] !== undefined) {
+            costume = this.argv['0'];
+            if (costume.substring(0, 8) !== 'costumes' && costume.substring(0, 11) !== 'accessories' && costume.substring(0, 7) !== 'servers') {
+                costume = `costumes/${costume}`;
+            }
+        }
+        costume = wardrobe + costume;
+        if (!fs_1.default.existsSync(costume)) {
+            console.log(`costume: ${chalk_1.default.green(path_1.default.basename(costume))} not found in wardrobe: ${chalk_1.default.green(wardrobe)}`);
+            process.exit();
+        }
+        /**
+        * tailorList
+        */
+        let tailorList = `${costume}/index.yml`;
+        if (!fs_1.default.existsSync(tailorList)) {
+            utils_1.default.warning(`index.yml not found in : ${costume}!`);
+            process.exit();
+        }
+        const materials = js_yaml_1.default.load(fs_1.default.readFileSync(tailorList, 'utf-8'));
+        if (json) {
+            console.log(JSON.stringify(materials, null, ' '));
+        }
+        else {
+            console.log(js_yaml_1.default.dump(materials));
+        }
+    }
+}
+exports.default = Show;
+Show.description = 'show costumes/accessories in wardrobe';
+Show.args = [{ name: 'costume', description: 'costume', required: false }];
+Show.flags = {
+    wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
+    json: core_1.Flags.boolean({ char: 'j', description: 'output JSON' }),
+    verbose: core_1.Flags.boolean({ char: 'v' }),
+    help: core_1.Flags.help({ char: 'h' })
+};

package/lib/commands/wardrobe/wear.d.ts

@@ -0,0 +1,20 @@
+import { Command } from '@oclif/core';
+/**
+ *
+ */
+export default class Wear extends Command {
+    static description: string;
+    static args: {
+        name: string;
+        description: string;
+        required: boolean;
+    }[];
+    static flags: {
+        wardrobe: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        no_accessories: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        silent: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
+    };
+    run(): Promise<void>;
+}

package/lib/commands/wardrobe/wear.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const tailor_1 = tslib_1.__importDefault(require("../../classes/tailor"));
+/**
+ *
+ */
+class Wear extends core_1.Command {
+    async run() {
+        const { argv, flags } = await this.parse(Wear);
+        let verbose = flags.verbose;
+        utils_1.default.titles(this.id + ' ' + this.argv);
+        let no_accessories = false;
+        if (flags.no_accessories) {
+            no_accessories = true;
+        }
+        let wardrobe = await utils_1.default.wardrobe();
+        if (flags.wardrobe !== undefined) {
+            wardrobe = flags.wardrobe;
+        }
+        wardrobe = `${path_1.default.resolve(process.cwd(), wardrobe)}/`;
+        if (!fs_1.default.existsSync(wardrobe)) {
+            utils_1.default.warning(`wardrobe: ${wardrobe} not found!`);
+            process.exit();
+        }
+        console.log(chalk_1.default.green(`wardrobe: `) + wardrobe);
+        /**
+         * costume
+         */
+        let costume = 'costumes/colibri';
+        if (this.argv['0'] !== undefined) {
+            costume = this.argv['0']; //12345678                                  12345678901                                  1234567
+            if (costume.substring(0, 8) !== 'costumes' && costume.substring(0, 11) !== 'accessories' && costume.substring(0, 7) !== 'servers') {
+                costume = `costumes/${costume}`;
+            }
+        }
+        costume = wardrobe + costume;
+        console.log(costume);
+        if (!fs_1.default.existsSync(costume)) {
+            console.log(`costume: ${chalk_1.default.green(path_1.default.basename(costume))} not found in wardrobe: ${chalk_1.default.green(wardrobe)}`);
+            process.exit();
+        }
+        /**
+        * tailorList
+        */
+        let tailorList = `${costume}/index.yml`;
+        if (!fs_1.default.existsSync(tailorList)) {
+            utils_1.default.warning(`index.yml not found in : ${costume}!`);
+            process.exit();
+        }
+        if (await utils_1.default.customConfirm(`Prepare your costume: ${costume}? Select yes to continue...`)) {
+            if (utils_1.default.isRoot()) {
+                const tailor = new tailor_1.default(costume);
+                await tailor.prepare(verbose, no_accessories);
+            }
+            else {
+                utils_1.default.useRoot(this.id);
+            }
+        }
+        else {
+            console.log('costume ' + chalk_1.default.cyan(costume) + ' not found in wardrobe: ' + chalk_1.default.green(wardrobe));
+        }
+    }
+}
+exports.default = Wear;
+Wear.description = 'wear costume/accessories from wardrobe';
+Wear.args = [{ name: 'costume', description: 'costume', required: false }];
+Wear.flags = {
+    wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
+    no_accessories: core_1.Flags.boolean({ char: 'n', description: 'not install accessories' }),
+    silent: core_1.Flags.boolean({ char: 's' }),
+    verbose: core_1.Flags.boolean({ char: 'v' }),
+    help: core_1.Flags.help({ char: 'h' })
+};

package/lib/components/elements/information.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const settings_1 = (0, tslib_1.__importDefault)(require("../../classes/settings"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("../../classes/pacman"));
-const utils_1 = (0, tslib_1.__importDefault)(require("../../classes/utils"));
-const title_1 = (0, tslib_1.__importDefault)(require("./title"));
+const settings_1 = tslib_1.__importDefault(require("../../classes/settings"));
+const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const title_1 = tslib_1.__importDefault(require("./title"));
 /**
  *
  */
@@ -16,6 +16,10 @@ async function information(verbose = false) {
     console.clear();
     const settings = new settings_1.default();
     settings.load();
+    const Wait = () => (react_1.default.createElement(ink_1.Box, { marginRight: 2 },
+        react_1.default.createElement(ink_1.Box, { marginRight: 2 },
+            react_1.default.createElement(ink_1.Text, null, " E G G S: the reproductive system of penguins"))));
+    (0, ink_1.render)(react_1.default.createElement(Wait, null));
     /**
      * nest
      */
@@ -34,7 +38,7 @@ async function information(verbose = false) {
             react_1.default.createElement(ink_1.Text, null,
                 "ovarium: ",
                 react_1.default.createElement(ink_1.Text, { color: "cyan" }, settings.work_dir.path)))));
-    //render(<Nest />)
+    // render(<Nest />)
     /**
      * Boot
      * @returns
@@ -48,7 +52,7 @@ async function information(verbose = false) {
             react_1.default.createElement(ink_1.Text, null,
                 "initrd.img: ",
                 react_1.default.createElement(ink_1.Text, { color: "cyan" }, settings.initrd_image)))));
-    (0, ink_1.render)(react_1.default.createElement(Boot, null));
+    // render(<Boot />)
     /**
      * Live
      */
@@ -64,7 +68,7 @@ async function information(verbose = false) {
             react_1.default.createElement(ink_1.Text, null,
                 "root passwd: ",
                 react_1.default.createElement(ink_1.Text, { color: "cyan" }, settings.config.root_passwd)))));
-    (0, ink_1.render)(react_1.default.createElement(Live, null));
+    // render(<Live />)
     const distroId = shelljs_1.default.exec('lsb_release -is', { silent: true }).stdout.trim();
     const releaseId = shelljs_1.default.exec('lsb_release -rs', { silent: true }).stdout.trim();
     const codenameId = shelljs_1.default.exec('lsb_release -cs', { silent: true }).stdout.trim();
@@ -84,29 +88,29 @@ async function information(verbose = false) {
                     "compatible: ",
                     react_1.default.createElement(ink_1.Text, { color: "cyan" },
                         settings.distro.distroLike,
-                        "/",
+                        " ",
                         settings.distro.releaseLike,
-                        "/",
+                        " ",
                         settings.distro.codenameLikeId))))));
-    (0, ink_1.render)(react_1.default.createElement(Distro, null));
+    // render(<Distro />)
     const dependencies = await pacman_1.default.prerequisitesCheck();
     const configurations = pacman_1.default.configurationCheck();
     let uefi = pacman_1.default.isUefi();
     let installer = false;
-    if (await pacman_1.default.isInstalledGui()) {
+    if (pacman_1.default.isInstalledGui()) {
         installer = await pacman_1.default.calamaresCheck();
     }
     const Ok = () => (react_1.default.createElement(ink_1.Text, { backgroundColor: "green" }, "OK"));
-    (0, ink_1.render)(react_1.default.createElement(Ok, null));
+    // render(<Ok />)
     const Ko = () => (react_1.default.createElement(ink_1.Text, { backgroundColor: "red", color: "white" }, "KO"));
-    (0, ink_1.render)(react_1.default.createElement(Ko, null));
+    // render(<Ko />)
     /**
      * CLI va verde se naked, altrimenti giallo
      */
     const CLI = () => (react_1.default.createElement(ink_1.Text, { backgroundColor: "green" }, "CLI"));
-    (0, ink_1.render)(react_1.default.createElement(CLI, null));
+    // render(<CLI />)
     const GUI = () => (react_1.default.createElement(ink_1.Text, { backgroundColor: "green" }, "GUI"));
-    (0, ink_1.render)(react_1.default.createElement(GUI, null));
+    // render(<GUI />)
     let initType = '';
     if (utils_1.default.isSysvinit()) {
         initType = 'sysvinit';
@@ -140,17 +144,17 @@ async function information(verbose = false) {
             react_1.default.createElement(ink_1.Text, null,
                 "init: ",
                 react_1.default.createElement(ink_1.Text, { color: "cyan" }, initType)))));
-    (0, ink_1.render)(react_1.default.createElement(Checks, null));
+    // render(<Checks />)
     const Presentation = () => (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(ink_1.Box, null,
             react_1.default.createElement(ink_1.Text, null, " ")),
         react_1.default.createElement(ink_1.Box, { borderStyle: "round", marginRight: 2, flexDirection: "column" },
             react_1.default.createElement(ink_1.Box, null,
-                react_1.default.createElement(ink_1.Text, null, "ISO images made with eggs can be installed with either the calamares GUI installer or the krill CLI installer. eggs includes krill installer inside.")),
-            react_1.default.createElement(ink_1.Box, null,
-                react_1.default.createElement(ink_1.Text, null, "krill installer is an opportunity if you are low on RAM, working on old distros or on architectures not yet supported by calamares.")),
+                react_1.default.createElement(ink_1.Text, { color: "cyan" }, "eggs install"),
+                react_1.default.createElement(ink_1.Text, null, " install your CLI iso with TUI installer krill, on GUI prefere calamares")),
             react_1.default.createElement(ink_1.Box, null,
-                react_1.default.createElement(ink_1.Text, null, "Usage: sudo eggs install will allways run calamares if present, sudo eggs install --cli will force CLI installer.")),
+                react_1.default.createElement(ink_1.Text, { color: "cyan" }, "eggs wardrobe"),
+                react_1.default.createElement(ink_1.Text, null, " build your personal system starting from cli")),
             react_1.default.createElement(ink_1.Box, null,
                 react_1.default.createElement(ink_1.Text, null, " ")),
             react_1.default.createElement(ink_1.Box, { flexDirection: "row" },
@@ -164,9 +168,9 @@ async function information(verbose = false) {
                         react_1.default.createElement(ink_1.Text, null, "sources "),
                         react_1.default.createElement(ink_1.Text, { color: "cyan" }, "https://github.com/pieroproietti/penguins-eggs")),
                     react_1.default.createElement(ink_1.Box, { marginRight: 2 },
-                        react_1.default.createElement(ink_1.Text, null, "meeting "),
-                        react_1.default.createElement(ink_1.Text, { color: "cyan" }, "https://meet.jit.si/PenguinsEggsMeeting")))))));
-    (0, ink_1.render)(react_1.default.createElement(Presentation, null));
+                        react_1.default.createElement(ink_1.Text, null, "wardrobe "),
+                        react_1.default.createElement(ink_1.Text, { color: "cyan" }, "https://github.com/pieroproietti/penguins-wardrobe")))))));
+    // render(<Presentation />)
     /**
      *
      */

package/lib/components/elements/steps.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
 function Steps({ step = 1 }) {
     let activeWelcome = false;

package/lib/components/elements/title.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const pjson_1 = (0, tslib_1.__importDefault)(require("pjson"));
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
+// import package.json
+const pjson = require('../../../package.json');
 function Title({ title = "krill" }) {
     return (
     // font="slick"
@@ -17,12 +18,12 @@ function Title({ title = "krill" }) {
         react_1.default.createElement(ink_1.Box, { flexDirection: "row" },
             react_1.default.createElement(ink_1.Text, { backgroundColor: "green" },
                 "     ",
-                pjson_1.default.name,
+                pjson.name,
                 "      "),
             react_1.default.createElement(ink_1.Text, { backgroundColor: "white", color: "blue" }, " Perri's brewery edition "),
             react_1.default.createElement(ink_1.Text, { backgroundColor: "red" },
                 "       ver. ",
-                pjson_1.default.version,
+                pjson.version,
                 "       "))));
 }
 exports.default = Title;

package/lib/components/finished.js

@@ -4,12 +4,13 @@ const tslib_1 = require("tslib");
 /**
  * Welcome
  */
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const pjson = require('../../package.json');
 function Finished({ installationDevice, hostName, userName }) {
     let productName = 'unknown';
     let version = 'x.x.x';

package/lib/components/install.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 /**
  * Welcome
  */
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 function Install({ message, percent, spinner = false }) {
     let productName = 'unknown';
     let version = 'x.x.x';

package/lib/components/keyboard.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 /**
  * Keyboard
  */
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 /**
  * modello tastiere da /usr/share/X11/xkb/rules/xorg.xml
  */
@@ -40,15 +40,12 @@ function Keyboard({ keyboardModel = '', keyboardLayout = '', keyboardVariant = '
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Model: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, keyboardModel)),
-                        react_1.default.createElement(ink_1.Newline, null),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Layout: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, keyboardLayout)),
-                        react_1.default.createElement(ink_1.Newline, null),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Variant: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, keyboardVariant)),
-                        react_1.default.createElement(ink_1.Newline, null),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Options: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, keyboardOptions))))))));

package/lib/components/location.js

@@ -4,12 +4,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 function Location({ region = '', zone = '', language = '', dateNumbers = '' }) {
     let productName = 'unknown';
     let version = 'x.x.x';

package/lib/components/network.js

@@ -4,12 +4,13 @@ const tslib_1 = require("tslib");
 /**
  * Welcome
  */
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const pjson = require('../../package.json');
 function Network({ iface, addressType, address, netmask, gateway, domain, dns }) {
     let productName = 'unknown';
     let version = 'x.x.x';

package/lib/components/partitions.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 /**
  * Partitions
  */
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 function Partitions({ installationDevice, installationMode, filesystemType, userSwapChoice }) {
     let installer = 'krill';
     let productName = 'unknown';

package/lib/components/summary.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 /**
  * Welcome
  */
-const react_1 = (0, tslib_1.__importDefault)(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 function Summary({ region, zone, language, keyboardModel, keyboardLayout, installationDevice }) {
     let productName = 'unknown';
     let version = 'x.x.x';

package/lib/components/users.js

@@ -4,13 +4,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const react_1 = (0, tslib_1.__importStar)(require("react"));
+const react_1 = tslib_1.__importStar(require("react"));
 const ink_1 = require("ink");
 // import Spinner from 'ink-spinner';
-const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
-const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const title_1 = tslib_1.__importDefault(require("./elements/title"));
+const steps_1 = tslib_1.__importDefault(require("./elements/steps"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 //create your forceUpdate hook
 function useForceUpdate() {
     const [value, setValue] = (0, react_1.useState)(0); // integer state