penguins-eggs 9.0.25 → 9.0.48

package/lib/classes/krill_prepare.d.ts

@@ -1,6 +1,10 @@
+import Locales from './locales';
+import Keyboards from './keyboards';
 import { INet } from '../interfaces';
 import { IWelcome, ILocation, IKeyboard, IPartitions, IUsers } from '../interfaces/i-krill';
 export default class Krill {
+    locales: Locales;
+    keyboards: Keyboards;
     /**
      *
      * @param cryped

package/lib/classes/krill_prepare.js

@@ -1,52 +1,75 @@
 "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");
-const utils_1 = (0, tslib_1.__importDefault)(require("./utils"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const systemctl_1 = tslib_1.__importDefault(require("./systemctl"));
+const locales_1 = tslib_1.__importDefault(require("./locales"));
+const keyboards_1 = tslib_1.__importDefault(require("./keyboards"));
 // libraries
 const exec = require('../lib/utils').exec;
-const welcome_1 = (0, tslib_1.__importDefault)(require("../components/welcome"));
-const location_1 = (0, tslib_1.__importDefault)(require("../components/location"));
-const partitions_1 = (0, tslib_1.__importDefault)(require("../components/partitions"));
-const keyboard_1 = (0, tslib_1.__importDefault)(require("../components/keyboard"));
-const users_1 = (0, tslib_1.__importDefault)(require("../components/users"));
-const network_1 = (0, tslib_1.__importDefault)(require("../components/network"));
-const summary_1 = (0, tslib_1.__importDefault)(require("../components/summary"));
-const select_languages_1 = (0, tslib_1.__importDefault)(require("../lib/select_languages"));
-const select_regions_1 = (0, tslib_1.__importDefault)(require("../lib/select_regions"));
-const select_zones_1 = (0, tslib_1.__importDefault)(require("../lib/select_zones"));
-const select_installation_device_1 = (0, tslib_1.__importDefault)(require("../lib/select_installation_device"));
-const select_installation_mode_1 = (0, tslib_1.__importDefault)(require("../lib/select_installation_mode"));
-const select_user_swap_choice_1 = (0, tslib_1.__importDefault)(require("../lib/select_user_swap_choice"));
-const select_filesystem_type_1 = (0, tslib_1.__importDefault)(require("../lib/select_filesystem_type"));
-const get_username_1 = (0, tslib_1.__importDefault)(require("../lib/get_username"));
-const get_userfullname_1 = (0, tslib_1.__importDefault)(require("../lib/get_userfullname"));
-const get_hostname_1 = (0, tslib_1.__importDefault)(require("../lib/get_hostname"));
-const get_password_1 = (0, tslib_1.__importDefault)(require("../lib/get_password"));
-const select_keyboard_layout_1 = (0, tslib_1.__importDefault)(require("../lib/select_keyboard_layout"));
-const select_interface_1 = (0, tslib_1.__importDefault)(require("../lib/select_interface"));
-const select_address_type_1 = (0, tslib_1.__importDefault)(require("../lib/select_address_type"));
-const get_address_1 = (0, tslib_1.__importDefault)(require("../lib/get_address"));
-const get_netmask_1 = (0, tslib_1.__importDefault)(require("../lib/get_netmask"));
-const get_gateway_1 = (0, tslib_1.__importDefault)(require("../lib/get_gateway"));
-const get_domain_1 = (0, tslib_1.__importDefault)(require("../lib/get_domain"));
-const get_dns_1 = (0, tslib_1.__importDefault)(require("../lib/get_dns"));
-const krill_install_1 = (0, tslib_1.__importDefault)(require("./krill_install"));
+const welcome_1 = tslib_1.__importDefault(require("../components/welcome"));
+const location_1 = tslib_1.__importDefault(require("../components/location"));
+const partitions_1 = tslib_1.__importDefault(require("../components/partitions"));
+const keyboard_1 = tslib_1.__importDefault(require("../components/keyboard"));
+const users_1 = tslib_1.__importDefault(require("../components/users"));
+const network_1 = tslib_1.__importDefault(require("../components/network"));
+const summary_1 = tslib_1.__importDefault(require("../components/summary"));
+const select_languages_1 = tslib_1.__importDefault(require("../lib/select_languages"));
+const select_regions_1 = tslib_1.__importDefault(require("../lib/select_regions"));
+const select_zones_1 = tslib_1.__importDefault(require("../lib/select_zones"));
+const select_installation_device_1 = tslib_1.__importDefault(require("../lib/select_installation_device"));
+const select_installation_mode_1 = tslib_1.__importDefault(require("../lib/select_installation_mode"));
+const select_user_swap_choice_1 = tslib_1.__importDefault(require("../lib/select_user_swap_choice"));
+const select_filesystem_type_1 = tslib_1.__importDefault(require("../lib/select_filesystem_type"));
+const get_username_1 = tslib_1.__importDefault(require("../lib/get_username"));
+const get_userfullname_1 = tslib_1.__importDefault(require("../lib/get_userfullname"));
+const get_hostname_1 = tslib_1.__importDefault(require("../lib/get_hostname"));
+const get_password_1 = tslib_1.__importDefault(require("../lib/get_password"));
+const select_keyboard_model_1 = tslib_1.__importDefault(require("../lib/select_keyboard_model"));
+const select_keyboard_layout_1 = tslib_1.__importDefault(require("../lib/select_keyboard_layout"));
+const select_keyboard_variant_1 = tslib_1.__importDefault(require("../lib/select_keyboard_variant"));
+const select_keyboard_option_1 = tslib_1.__importDefault(require("../lib/select_keyboard_option"));
+const select_interface_1 = tslib_1.__importDefault(require("../lib/select_interface"));
+const select_address_type_1 = tslib_1.__importDefault(require("../lib/select_address_type"));
+const get_address_1 = tslib_1.__importDefault(require("../lib/get_address"));
+const get_netmask_1 = tslib_1.__importDefault(require("../lib/get_netmask"));
+const get_gateway_1 = tslib_1.__importDefault(require("../lib/get_gateway"));
+const get_domain_1 = tslib_1.__importDefault(require("../lib/get_domain"));
+const get_dns_1 = tslib_1.__importDefault(require("../lib/get_dns"));
+const krill_install_1 = tslib_1.__importDefault(require("./krill_install"));
 class Krill {
+    constructor() {
+        this.locales = new locales_1.default();
+        this.keyboards = new keyboards_1.default();
+    }
     /**
      *
      * @param cryped
      */
     async prepare(cryped = false, pve = false, verbose = false) {
         /**
-         * check lvm2
+         * Check for disk presence
+         */
+        const drives = shelljs_1.default.exec('lsblk |grep disk|cut -f 1 "-d "', { silent: true }).stdout.trim().split('\n');
+        if (drives[0] === '') {
+            await utils_1.default.pressKeyToExit(`No disk to install the system in this machine.\nkrill installer refuses to continue`);
+        }
+        /**
+         * check for lvm2
          */
         if (await this.pvExist()) {
-            utils_1.default.warning(`There is a lvm2 volume in the system, remove it manually before installation.\nkrill installer refuses to continue`);
-            process.exit(0);
+            await utils_1.default.pressKeyToExit(`There is a lvm2 volume in the system, remove it manually before installation.\nkrill installer refuses to continue`);
+        }
+        /**
+        * stop udisks2.service
+        */
+        const systemdCtl = new systemctl_1.default(verbose);
+        if (await systemdCtl.isActive('udisks2.service')) {
+            await systemdCtl.stop('udisks2.service');
         }
         const oWelcome = await this.welcome();
         const oLocation = await this.location(oWelcome.language);
@@ -61,19 +84,14 @@ class Krill {
      * WELCOME
      */
     async welcome() {
-        let language = shelljs_1.default.exec('cat /etc/default/locale |grep LANG=| cut -f2 -d=|cut -f1 -d.', { silent: true }).stdout.trim();
+        let language = await this.locales.getDefault();
         let welcomeElem;
         while (true) {
             welcomeElem = react_1.default.createElement(welcome_1.default, { language: language });
             if (await confirm(welcomeElem, "Confirm Welcome datas?")) {
                 break;
             }
-            else {
-                language = '';
-            }
-            welcomeElem = react_1.default.createElement(welcome_1.default, { language: language });
-            redraw(welcomeElem);
-            language = await (0, select_languages_1.default)();
+            language = await (0, select_languages_1.default)(language);
         }
         return { language: language };
     }
@@ -81,23 +99,15 @@ class Krill {
      * LOCATION
      */
     async location(language) {
-        let region = shelljs_1.default.exec('cat /etc/timezone |cut -f1 -d/', { silent: true }).stdout.trim();
-        let zone = shelljs_1.default.exec('cat /etc/timezone |cut -f2 -d/', { silent: true }).stdout.trim();
+        let region = shelljs_1.default.exec('cut -f1 -d/ < /etc/timezone', { silent: true }).stdout.trim();
+        let zone = shelljs_1.default.exec('cut -f2 -d/ < /etc/timezone', { silent: true }).stdout.trim();
         let locationElem;
         while (true) {
             locationElem = react_1.default.createElement(location_1.default, { language: language, region: region, zone: zone });
             if (await confirm(locationElem, "Confirm location datas?")) {
                 break;
             }
-            else {
-                region = '';
-                zone = '';
-            }
-            locationElem = react_1.default.createElement(location_1.default, { language: language, region: region, zone: zone });
-            redraw(locationElem);
-            region = await (0, select_regions_1.default)();
-            locationElem = react_1.default.createElement(location_1.default, { language: language, region: region, zone: zone });
-            redraw(locationElem);
+            region = await (0, select_regions_1.default)(region);
             zone = await (0, select_zones_1.default)(region);
         }
         return {
@@ -110,37 +120,41 @@ class Krill {
     * KEYBOARD
     */
     async keyboard() {
-        let keyboardModel = shelljs_1.default.exec('cat /etc/default/keyboard |grep XKBMODEL|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
-        if (keyboardModel === '') {
-            keyboardModel = "pc105";
-        }
-        let keyboardLayout = shelljs_1.default.exec('cat /etc/default/keyboard |grep XKBLAYOUT|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
-        let keyboardVariant = shelljs_1.default.exec('/etc/default/keyboard |grep XKBVARIANT|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
-        let keyboardOptions = shelljs_1.default.exec('cat /etc/default/keyboard |grep XKBOPTIONS|cut -f2 -d=|cut -f2 "-d\\""', { silent: true }).stdout.trim();
+        let keyboardModel = await this.keyboards.getModel();
+        let keyboardLayout = await this.keyboards.getLayout();
+        let keyboardVariant = await this.keyboards.getVariant();
+        let keyboardOption = await this.keyboards.getOption();
         let keyboardElem;
         while (true) {
-            keyboardElem = react_1.default.createElement(keyboard_1.default, { keyboardModel: keyboardModel, keyboardLayout: keyboardLayout, keyboardVariant: keyboardVariant });
+            keyboardElem = react_1.default.createElement(keyboard_1.default, { keyboardModel: keyboardModel, keyboardLayout: keyboardLayout, keyboardVariant: keyboardVariant, keyboardOptions: keyboardOption });
             if (await confirm(keyboardElem, "Confirm Keyboard datas?")) {
                 break;
             }
             else {
                 keyboardModel = 'pc105';
-                keyboardLayout = '';
-                keyboardVariant = '';
             }
-            keyboardLayout = await (0, select_keyboard_layout_1.default)();
+            keyboardModel = await (0, select_keyboard_model_1.default)(keyboardModel);
+            keyboardLayout = await (0, select_keyboard_layout_1.default)(keyboardLayout);
+            keyboardVariant = await (0, select_keyboard_variant_1.default)(keyboardLayout);
+            keyboardOption = await (0, select_keyboard_option_1.default)(keyboardOption);
         }
         return {
             keyboardModel: keyboardModel,
             keyboardLayout: keyboardLayout,
-            keyboardVariant: keyboardVariant
+            keyboardVariant: keyboardVariant,
+            keyboardOption: keyboardOption
         };
     }
     /**
     * PARTITIONS
     */
     async partitions(crypted = false, pve = false) {
-        let installationDevice = '/dev/sda';
+        const drives = shelljs_1.default.exec('lsblk |grep disk|cut -f 1 "-d "', { silent: true }).stdout.trim().split('\n');
+        const driveList = [];
+        drives.forEach((element) => {
+            driveList.push('/dev/' + element);
+        });
+        let installationDevice = driveList[0]; // it was just /dev/sda before
         let installationMode = 'standard';
         if (crypted) {
             installationMode = 'full-encrypted';
@@ -168,17 +182,9 @@ class Krill {
                 filesystemType = '';
                 userSwapChoice = '';
             }
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
-            redraw(partitionsElem);
             installationDevice = await (0, select_installation_device_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
-            redraw(partitionsElem);
             installationMode = await (0, select_installation_mode_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
-            redraw(partitionsElem);
             filesystemType = await (0, select_filesystem_type_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
-            redraw(partitionsElem);
             userSwapChoice = await (0, select_user_swap_choice_1.default)();
         }
         return {
@@ -205,17 +211,9 @@ class Krill {
             if (await confirm(usersElem, "Confirm Users datas?")) {
                 break;
             }
-            usersElem = react_1.default.createElement(users_1.default, { name: name, fullname: fullname, hostname: hostname, password: password, rootPassword: rootPassword, autologin: autologin, sameUserPassword: sameUserPassword });
-            redraw(usersElem);
             name = await (0, get_username_1.default)(name);
-            usersElem = react_1.default.createElement(users_1.default, { name: name, fullname: fullname, hostname: hostname, password: password, rootPassword: rootPassword, autologin: autologin, sameUserPassword: sameUserPassword });
-            redraw(usersElem);
             fullname = await (0, get_userfullname_1.default)(fullname);
-            usersElem = react_1.default.createElement(users_1.default, { name: name, fullname: fullname, hostname: hostname, password: password, rootPassword: rootPassword, autologin: autologin, sameUserPassword: sameUserPassword });
-            redraw(usersElem);
             password = await (0, get_password_1.default)(password);
-            usersElem = react_1.default.createElement(users_1.default, { name: name, fullname: fullname, hostname: hostname, password: password, rootPassword: rootPassword, autologin: autologin, sameUserPassword: sameUserPassword });
-            redraw(usersElem);
             hostname = await (0, get_hostname_1.default)(hostname);
         }
         return {
@@ -296,7 +294,7 @@ class Krill {
      */
     async pvExist() {
         let exist = false;
-        const check = 'pvdisplay |grep "PV Name" >/dev/null && echo 1|| echo 0';
+        const check = `#!/bin/sh\npvdisplay |grep "PV Name" >/dev/null && echo 1|| echo 0`;
         if (shelljs_1.default.exec(check).stdout.trim() === '1') {
             exist = true;
         }
@@ -327,7 +325,7 @@ async function confirm(elem, msg = "Confirm") {
  */
 function redraw(elem) {
     let opt = {};
-    opt.patchConsole = false;
+    opt.patchConsole = true;
     opt.debug = false;
     shelljs_1.default.exec('clear');
     (0, ink_1.render)(elem, opt);

package/lib/classes/locales.d.ts

@@ -0,0 +1,14 @@
+export default class Locales {
+    /**
+     *
+     */
+    getEnabled(): Promise<string[]>;
+    /**
+     *
+     */
+    getSupported(): Promise<string[]>;
+    /**
+     *
+     */
+    getDefault(): Promise<string>;
+}

package/lib/classes/locales.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const utils_1 = require("../lib/utils");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+class Locales {
+    /**
+     *
+     */
+    async getEnabled() {
+        const cmd = `localectl list-locales`;
+        let enabledLocales = [];
+        const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
+        if (result.code === 0) {
+            const lines = result.data.split('\n');
+            for (const line of lines) {
+                enabledLocales.push(line.replace(/"/g, '').replace(/'/g, '').trim());
+            }
+        }
+        return enabledLocales;
+    }
+    /**
+     *
+     */
+    async getSupported() {
+        const file = '/usr/share/i18n/SUPPORTED';
+        const cmd = `cut -f1 -d.|grep UTF-0 < ${file}`;
+        let lines = [];
+        const retLines = [];
+        if (fs_1.default.existsSync(file)) {
+            lines = fs_1.default.readFileSync(file, 'utf-8').split('\n');
+            for (const line of lines) {
+                retLines.push(line.replace(' UTF-8', ''));
+            }
+        }
+        return retLines;
+    }
+    /**
+     *
+     */
+    async getDefault() {
+        const file = '/etc/default/locale';
+        const cmd = `grep LANG < ${file}|cut -f2 -d=`;
+        let defaultLanguage = "";
+        if (fs_1.default.existsSync(file)) {
+            const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
+            if (result.code === 0) {
+                defaultLanguage = result.data.replace(/"/g, '').replace(/'/g, '').trim();
+            }
+        }
+        return defaultLanguage;
+    }
+}
+exports.default = Locales;

package/lib/classes/n8.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 class n8 {
     /**
      *

package/lib/classes/ovary.d.ts

@@ -6,23 +6,19 @@ import Users from './users';
  * Ovary:
  */
 export default class Ovary {
+    verbose: boolean;
+    echo: {};
     toNull: string;
     incubator: Incubator;
     settings: Settings;
     familyId: string;
     snapshot_prefix: string;
     snapshot_basename: string;
-    theme: string;
     compression: string;
-    /**
-     * Egg
-     * @param compression
-     */
-    constructor(snapshot_prefix?: string, snapshot_basename?: string, theme?: string, compression?: string);
     /**
      * @returns {boolean} success
      */
-    fertilization(): Promise<boolean>;
+    fertilization(snapshot_prefix?: string, snapshot_basename?: string, theme?: string, compression?: string): Promise<boolean>;
     /**
      *
      * @param basename
@@ -31,7 +27,12 @@ export default class Ovary {
     /**
      * Crea la struttura della workdir
      */
-    liveCreateStructure(verbose?: boolean): Promise<void>;
+    liveCreateStructure(): Promise<void>;
+    /**
+     *
+     * @param cmd
+     */
+    tryCatch(cmd?: string): Promise<void>;
     /**
      * editLiveFs
      * - Truncate logs, remove archived log
@@ -42,33 +43,32 @@ export default class Ovary {
      * - Add some basic files to /dev
      * - Clear configs from /etc/network/interfaces, wicd and NetworkManager and netman
      */
-    editLiveFs(verbose?: boolean): Promise<void>;
+    editLiveFs(): Promise<void>;
     /**
      * syslinux
      */
-    syslinux(verbose?: boolean): Promise<void>;
+    syslinux(): Promise<void>;
     /**
      *  async isolinux
      */
-    isolinux(theme?: string, verbose?: boolean): Promise<void>;
+    isolinux(theme?: string): Promise<void>;
     /**
      * copy kernel
      */
-    kernelCopy(verbose?: boolean): Promise<void>;
+    kernelCopy(): Promise<void>;
     /**
-     * necessita di verbose
+     * necessita di echoYes
      */
-    initrdCreate(verbose?: boolean): Promise<void>;
+    initrdCreate(): Promise<void>;
     /**
-     *
-     * @param verbose
+     * We must upgrade to initrdCreate for Debian/Ubuntu
      * @returns
      */
     initrdCopy(verbose?: boolean): Promise<void>;
     /**
      * squashFs: crea in live filesystem.squashfs
      */
-    makeSquashfs(scriptOnly?: boolean, verbose?: boolean): Promise<void>;
+    makeSquashfs(scriptOnly?: boolean): Promise<void>;
     /**
      * Restituisce true per le direcory da montare con overlay
      *
@@ -97,36 +97,36 @@ export default class Ovary {
      *
      * @param verbose
      */
-    bindLiveFs(verbose?: boolean): Promise<void>;
+    bindLiveFs(): Promise<void>;
     /**
      * ubind del fs live
      * @param verbose
      */
-    uBindLiveFs(verbose?: boolean): Promise<void>;
+    uBindLiveFs(): Promise<void>;
     /**
      * bind dei virtual file system
      */
-    bindVfs(verbose?: boolean): Promise<void>;
+    bindVfs(): Promise<void>;
     /**
      *
      * @param verbose
      */
-    ubindVfs(verbose?: boolean): Promise<void>;
+    ubindVfs(): Promise<void>;
     /**
      *
      * @param verbose
      */
-    cleanUsersAccounts(verbose?: boolean): Promise<void>;
+    cleanUsersAccounts(): Promise<void>;
     /**
      * list degli utenti: grep -E 1[0-9]{3}  /etc/passwd | sed s/:/\ / | awk '{print $1}'
      * create la home per user_opt
      * @param verbose
      */
-    createUserLive(verbose?: boolean): Promise<void>;
+    createUserLive(): Promise<void>;
     /**
      *
      */
-    createXdgAutostart(theme: string | undefined, myAddons: IMyAddons, verbose?: boolean): Promise<void>;
+    createXdgAutostart(theme: string | undefined, myAddons: IMyAddons): Promise<void>;
     /**
      * Creazione link desktop per lxde
      * @param name
@@ -142,13 +142,13 @@ export default class Ovary {
     /**
      * makeEfi
     */
-    makeEfi(theme?: string, verbose?: boolean): Promise<void>;
+    makeEfi(theme?: string): Promise<void>;
     /**
      * makeDotDisk
      * create .disk/info, .disk/mksquashfs, .disk/mkiso
      * return mkiso
      */
-    makeDotDisk(backup?: boolean, verbose?: boolean): string;
+    makeDotDisk(backup?: boolean): string;
     /**
      *
      * @param backup
@@ -159,7 +159,7 @@ export default class Ovary {
      * makeIso
      * cmd: cmd 4 xorirriso
      */
-    makeIso(cmd: string, scriptOnly?: boolean, verbose?: boolean): Promise<void>;
+    makeIso(cmd: string, scriptOnly?: boolean): Promise<void>;
     /**
      * finished = show the results
      * @param scriptOnly