penguins-eggs 9.1.30 → 9.1.35

package/lib/classes/keyboards.d.ts

@@ -9,37 +9,35 @@ export default class Keyboard {
     options: string[];
     constructor();
     /**
-     *
-     * @returns
+     * XKBMODEL[]
      */
     getModels(): IXkbModel[];
     /**
-     * 012345678901234567890123456789
-     * us              English (US)
+     * XKBLAYOUT=[]
      */
     getLayouts(): IXkbLayout[];
     /**
-     *
+     * IXkbVariant[]
      */
     getVariants(layout: string): IXkbVariant[];
     /**
-     *
+     * XKBOPTIONS[]
      */
     getOptions(): IXkbOption[];
     /**
-     *
+     * XKBMODEL='pc105'
      */
-    getVariant(): Promise<string>;
+    getModel(): Promise<string>;
     /**
-     *
+     * XKBLAYOUT='us'
      */
     getLayout(): Promise<string>;
     /**
-     *
+     * XKBVARIANT=''
      */
-    getModel(): Promise<string>;
+    getVariant(): Promise<string>;
     /**
-     *
+     * XKBOPTIONS=''
      */
     getOption(): Promise<string>;
 }

package/lib/classes/keyboards.js

@@ -68,8 +68,7 @@ class Keyboard {
         }
     }
     /**
-     *
-     * @returns
+     * XKBMODEL[]
      */
     getModels() {
         // 0123456789012345678901234567890123456789
@@ -84,12 +83,9 @@ class Keyboard {
         return oModels;
     }
     /**
-     * 012345678901234567890123456789
-     * us              English (US)
+     * XKBLAYOUT=[]
      */
     getLayouts() {
-        // 0123456789012345678901234567890123456789
-        // us              English (US)
         const oLayouts = [];
         for (const layout of this.layouts) {
             const l = {};
@@ -100,7 +96,7 @@ class Keyboard {
         return oLayouts;
     }
     /**
-     *
+     * IXkbVariant[]
      */
     getVariants(layout) {
         // 0123456789012345678901234567890123456789
@@ -118,7 +114,7 @@ class Keyboard {
         return aoVariants;
     }
     /**
-     *
+     * XKBOPTIONS[]
      */
     getOptions() {
         // 0123456789012345678901234567890123456789
@@ -133,27 +129,27 @@ class Keyboard {
         return aoOptions;
     }
     /**
-     *
+     * XKBMODEL='pc105'
      */
-    async getVariant() {
+    async getModel() {
         const file = '/etc/default/keyboard';
-        const cmd = `grep XKBVARIANT < ${file} | cut -f2 -d=|cut -f2 "-d\\""`;
-        let keyboardVariant = 'pc195';
+        const cmd = `grep XKBMODEL < ${file} |cut -f2 -d= | cut -f2 "-d\\""`;
+        let keyboardModel = 'pc105';
         if (fs_1.default.existsSync(file)) {
             const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
-                keyboardVariant = result.data.trim();
+                keyboardModel = result.data.trim();
             }
         }
-        return keyboardVariant;
+        return keyboardModel;
     }
     /**
-     *
+     * XKBLAYOUT='us'
      */
     async getLayout() {
         const file = '/etc/default/keyboard';
         const cmd = `grep XKBLAYOUT < /etc/default/keyboard | cut -f2 -d= | cut -f2 "-d\\""`;
-        let keyboardLayout = 'pc195';
+        let keyboardLayout = 'us';
         if (fs_1.default.existsSync(file)) {
             const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
@@ -163,22 +159,22 @@ class Keyboard {
         return keyboardLayout;
     }
     /**
-     *
+     * XKBVARIANT=''
      */
-    async getModel() {
+    async getVariant() {
         const file = '/etc/default/keyboard';
-        const cmd = `grep XKBMODEL < ${file} |cut -f2 -d= | cut -f2 "-d\\""`;
-        let keyboardModel = 'pc195';
+        const cmd = `grep XKBVARIANT < ${file} | cut -f2 -d=|cut -f2 "-d\\""`;
+        let keyboardVariant = '';
         if (fs_1.default.existsSync(file)) {
             const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
-                keyboardModel = result.data.trim();
+                keyboardVariant = result.data.trim();
             }
         }
-        return keyboardModel;
+        return keyboardVariant;
     }
     /**
-     *
+     * XKBOPTIONS=''
      */
     async getOption() {
         const file = '/etc/default/keyboard';

package/lib/classes/locales.js

@@ -3,11 +3,14 @@ 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"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
 class Locales {
     /**
      *
      */
     async getEnabled() {
+        // Restituisce i locales abilitati in Debian, per manjaro quelli presenti
+        // in /etc/locale.gen anche se #disabilitati
         const cmd = `localectl list-locales`;
         let enabledLocales = [];
         const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
@@ -23,17 +26,19 @@ class Locales {
      *
      */
     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', ''));
-            }
+        const distro = new distro_1.default();
+        let supporteds = [];
+        if (distro.familyId === 'debian') {
+            supporteds = fs_1.default.readFileSync('/usr/share/i18n/SUPPORTED', 'utf-8').split('\n');
+        }
+        else if (distro.familyId === 'archlinux') {
+            supporteds = (await (0, utils_1.exec)('localectl list-locales', { capture: true, echo: false, ignore: false })).data.split('\n');
+        }
+        const elements = [];
+        for (const elem of supporteds) {
+            elements.push(elem.replace(' UTF-8', ''));
         }
-        return retLines;
+        return elements;
     }
     /**
      *

package/lib/classes/ovary.js

@@ -542,6 +542,7 @@ class Ovary {
         }
         let lackVmlinuzImage = false;
         if (fs_1.default.existsSync(this.settings.kernel_image)) {
+            console.log('kernel image:' + this.settings.kernel_image);
             await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, this.echo);
         }
         else {
@@ -561,7 +562,12 @@ class Ovary {
         let initrdImg = utils_2.default.initrdImg();
         initrdImg = initrdImg.substring(initrdImg.lastIndexOf('/') + 1);
         utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.work_dir.pathIso}/live/`);
-        await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        if (this.settings.distro.distroId === 'ManjaroLinux') {
+            await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio-produce.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        }
+        else if (this.settings.distro.distroId === 'Arch') {
+            await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/archlinux/mkinitcpio-produce.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        }
     }
     /**
      * We must upgrade to initrdCreate for Debian/Ubuntu
@@ -609,7 +615,13 @@ class Ovary {
         /**
          * exclude all the accurence of cryptdisks in rc0.d, etc
          */
-        let fexcludes = ["/boot/efi/EFI", "/etc/fstab", "/etc/mtab", "/etc/udev/rules.d/70-persistent-cd.rules", "/etc/udev/rules.d/70-persistent-net.rules"];
+        let fexcludes = [
+            "/boot/efi/EFI",
+            "/etc/fstab",
+            "/etc/mtab",
+            "/etc/udev/rules.d/70-persistent-cd.rules",
+            "/etc/udev/rules.d/70-persistent-net.rules"
+        ];
         for (let i in fexcludes) {
             this.addRemoveExclusion(true, fexcludes[i]);
         }
@@ -632,12 +644,12 @@ class Ovary {
             //this.addRemoveExclusion(true, '/etc/localtime')
         }
         this.addRemoveExclusion(true, this.settings.config.snapshot_dir /* .absolutePath() */);
-        const compression = `-comp ${this.settings.config.compression}`;
         if (fs_1.default.existsSync(`${this.settings.work_dir.pathIso}/live/filesystem.squashfs`)) {
             fs_1.default.unlinkSync(`${this.settings.work_dir.pathIso}/live/filesystem.squashfs`);
         }
-        // let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes} `
-        let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes} `;
+        const compression = `-comp ${this.settings.config.compression}`;
+        // let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`
+        let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`;
         cmd = cmd.replace(/\s\s+/g, ' ');
         utils_2.default.writeX(`${this.settings.work_dir.path}mksquashfs`, cmd);
         if (!scriptOnly) {
@@ -1076,7 +1088,7 @@ class Ovary {
      */
     addRemoveExclusion(add, exclusion) {
         if (exclusion.startsWith('/')) {
-            exclusion = exclusion.slice(1); // remove / initial Non compatible with
+            exclusion = exclusion.slice(1); // remove / initial Non compatible with rsync
         }
         if (add) {
             this.settings.session_excludes += this.settings.session_excludes === '' ? `-e '${exclusion}' ` : ` '${exclusion}' `;

package/lib/classes/utils.js

@@ -18,6 +18,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const pacman_1 = tslib_1.__importDefault(require("./pacman"));
 // import { green, whiteBright } from 'chalk'
 const child_process_1 = require("child_process");
+const distro_1 = tslib_1.__importDefault(require("./distro"));
 const pjson = require('../../package.json');
 /**
  * Utils: general porpourse utils
@@ -81,15 +82,19 @@ class Utils {
                 }
             });
         }
-        // if vmlinuz exist in /boot
         if (!fs_1.default.existsSync(vmlinuz)) {
+            // check if vmlinuz exist in /boot
             if (fs_1.default.existsSync('/boot' + vmlinuz)) {
                 vmlinuz = '/boot' + vmlinuz;
             }
+            else {
+                vmlinuz = '/path/to/vmlinuz';
+            }
         }
-        // if vmlinux don't exist
-        if (!fs_1.default.existsSync(vmlinuz)) {
-            vmlinuz = '/path/to/vmlinuz';
+        // Arch
+        let distro = new distro_1.default();
+        if (distro.distroId === 'Arch') {
+            vmlinuz = '/boot/vmlinuz-linux';
         }
         // btrfs
         if (vmlinuz.indexOf('@') > 0) {
@@ -121,7 +126,14 @@ class Utils {
             initrd = 'initrd';
             version = vmlinuz.substring(vmlinuz.indexOf('-'));
         }
-        return path + initrd + version;
+        let distro = new distro_1.default();
+        if (distro.distroId === 'Arch') {
+            initrd = '/boot/initramfs-linux.img';
+        }
+        else {
+            initrd = path + initrd + version;
+        }
+        return initrd;
     }
     /**
      * Occore vedere un modo per creare machine-id dove non esiste
@@ -482,7 +494,8 @@ class Utils {
         const paths = [
             '/lib/live/mount',
             '/lib/live/mount/rootfs/filesystem.squashfs',
-            '/live/aufs' // mx-linux
+            '/live/aufs',
+            '/run/miso/sfs/livefs' // manjaro qonos
         ];
         for (let i = 0; i < paths.length; i++) {
             if (Utils.isMountpoint(paths[i])) {

package/lib/commands/{install.d.ts → krill.d.ts}

@@ -16,6 +16,7 @@ export default class Install extends Command {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
+    static aliases: string[];
     static description: string;
     static examples: string[];
     /**

package/lib/commands/{install.js → krill.js}

@@ -10,7 +10,7 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
-const krill_prepare_1 = tslib_1.__importDefault(require("../classes/krill_prepare"));
+const krill_prepare_1 = tslib_1.__importDefault(require("../krill/krill-prepare"));
 const pacman_1 = tslib_1.__importDefault(require("../classes/pacman"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 /**
@@ -72,6 +72,6 @@ Install.flags = {
     help: core_1.Flags.help({ char: 'h' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' })
 };
+Install.aliases = [`install`];
 Install.description = 'command-line system installer - the egg became a penguin!';
-// static aliases = ['krill']
 Install.examples = ['$ eggs install\nInstall the system using GUI or CLI installer\n'];

package/lib/commands/produce.js

@@ -18,7 +18,6 @@ const config_1 = tslib_1.__importDefault(require("./config"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const settings_1 = tslib_1.__importDefault(require("../classes/settings"));
 class Produce extends core_1.Command {
     async run() {
         utils_1.default.titles(this.id + ' ' + this.argv);
@@ -60,44 +59,23 @@ class Produce extends core_1.Command {
             if (flags.basename !== undefined) {
                 basename = flags.basename;
             }
-            /**
-             * Analisi del tipo di compressione del kernel
-             *
-             */
             const compressors = new compressors_1.default();
             await compressors.populate();
-            let fastest = 'gzip';
-            if (compressors.isEnabled.zstd) {
-                fastest = 'zstd -Xcompression-level 1 -b 262144';
-            }
-            else if (compressors.isEnabled.lz4) {
-                fastest = 'lz4';
-            }
-            /**
-             * jessie e stretch will use gzip for fastest
-            */
-            const settings = new settings_1.default();
-            if (settings.distro.codenameLikeId === 'jessie' || settings.distro.codenameLikeId === 'stretch') {
-                fastest = 'gzip';
-            }
-            let compression = ''; // se vuota, compression viene definita da loadsettings, default xz
-            if (flags.fast) {
-                compression = fastest;
+            let compression = compressors.normal();
+            if (flags.max) {
+                compression = compressors.max();
             }
-            else if (flags.normal) {
-                compression = 'xz';
+            else if (flags.fast) {
+                compression = compressors.fast();
             }
-            else if (flags.max) {
-                compression = 'xz -Xbcj x86';
+            const release = flags.release;
+            if (release) {
+                compression = compressors.max();
             }
             const backup = flags.backup;
             const verbose = flags.verbose;
             const scriptOnly = flags.script;
             const yolkRenew = flags.yolk;
-            const release = flags.release;
-            if (release) {
-                compression = 'xz -Xbcj x86';
-            }
             /**
              * theme: if not defined will use eggs
              */

package/lib/components/elements/information.js

@@ -89,8 +89,6 @@ async function information(verbose = false) {
                     react_1.default.createElement(ink_1.Text, { color: "cyan" },
                         settings.distro.distroLike,
                         " ",
-                        settings.distro.releaseLike,
-                        " ",
                         settings.distro.codenameLikeId))))));
     // render(<Distro />)
     const dependencies = await pacman_1.default.prerequisitesCheck();

package/lib/{classes/krill_prepare.d.ts → krill/krill-prepare.d.ts}

@@ -1,5 +1,12 @@
-import Locales from './locales';
-import Keyboards from './keyboards';
+/**
+ * penguins-eggs: krill
+ *
+ * author: Piero Proietti
+ * mail: piero.proietti@gmail.com
+ *
+ */
+import Locales from '../classes/locales';
+import Keyboards from '../classes/keyboards';
 import { INet } from '../interfaces';
 import { IWelcome, ILocation, IKeyboard, IPartitions, IUsers } from '../interfaces/i-krill';
 export default class Krill {

package/lib/{classes/krill_prepare.js → krill/krill-prepare.js}

@@ -1,14 +1,42 @@
 "use strict";
+/**
+ * penguins-eggs: krill
+ *
+ * author: Piero Proietti
+ * mail: piero.proietti@gmail.com
+ *
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+/**
+ * Ideally, I want to respect calamares way, remplementing the same (SEMPLIFIED) steps
+ * for CLI
+ *
+ * Phase 1 - prepare.
+ * View modules are shown as UI pages, jobs from job modules
+ * are executed immediately in the background.
+ *   - welcome
+ *   - locale
+ *   - keyboard
+ *   - partition
+ *   - keyboard
+ *   - users
+ *   - network
+ *   - summary
+*/
+/**
+ * problems:
+ *
+ */
 const react_1 = tslib_1.__importDefault(require("react"));
 const ink_1 = require("ink");
-const utils_1 = tslib_1.__importDefault(require("./utils"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
+const axios_1 = tslib_1.__importDefault(require("axios"));
 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"));
+const systemctl_1 = tslib_1.__importDefault(require("../classes/systemctl"));
+const locales_1 = tslib_1.__importDefault(require("../classes/locales"));
+const keyboards_1 = tslib_1.__importDefault(require("../classes/keyboards"));
 // libraries
 const exec = require('../lib/utils').exec;
 const welcome_1 = tslib_1.__importDefault(require("../components/welcome"));
@@ -40,7 +68,7 @@ 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"));
+const krill_sequence_1 = tslib_1.__importDefault(require("./krill-sequence"));
 class Krill {
     constructor() {
         this.locales = new locales_1.default();
@@ -78,13 +106,14 @@ class Krill {
         const oUsers = await this.users();
         const oNetwork = await this.network();
         await this.summary(oLocation, oKeyboard, oPartitions);
+        // installation
         await this.install(oLocation, oKeyboard, oPartitions, oUsers, oNetwork, verbose);
     }
     /**
      * WELCOME
      */
     async welcome() {
-        let language = await this.locales.getDefault();
+        let language = 'en_US.UTF-8'; // await this.locales.getDefault()
         let welcomeElem;
         while (true) {
             welcomeElem = react_1.default.createElement(welcome_1.default, { language: language });
@@ -99,8 +128,23 @@ class Krill {
      * LOCATION
      */
     async location(language) {
+        // get timezone local
         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();
+        // Try to auto-configure timezone by internet
+        const url = `https://geoip.kde.org/v1/calamares`;
+        try {
+            const response = await axios_1.default.get(url);
+            if (response.statusText === 'OK') {
+                const data = JSON.stringify(response.data);
+                const obj = JSON.parse(data);
+                region = obj.time_zone.substring(0, obj.time_zone.indexOf('/'));
+                zone = obj.time_zone.substring(obj.time_zone.indexOf('/') + 1);
+            }
+        }
+        catch (error) {
+            console.error('error: ' + error);
+        }
         let locationElem;
         while (true) {
             locationElem = react_1.default.createElement(location_1.default, { language: language, region: region, zone: zone });
@@ -132,11 +176,17 @@ class Krill {
             }
             else {
                 keyboardModel = 'pc105';
+                keyboardModel = await (0, select_keyboard_model_1.default)(keyboardModel);
+                keyboardLayout = 'us';
+                keyboardLayout = await (0, select_keyboard_layout_1.default)(keyboardLayout);
+                keyboardVariant = '';
+                keyboardVariant = await (0, select_keyboard_variant_1.default)(keyboardLayout);
+                keyboardOption = '';
+                keyboardOption = await (0, select_keyboard_option_1.default)(keyboardOption);
+                if (keyboardModel === '') {
+                    keyboardModel = 'pc105';
+                }
             }
-            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,
@@ -286,8 +336,8 @@ class Krill {
      * INSTALL
      */
     async install(location, keyboard, partitions, users, network, verbose = false) {
-        const hatching = new krill_install_1.default(location, keyboard, partitions, users, network);
-        hatching.install(verbose);
+        const sequence = new krill_sequence_1.default(location, keyboard, partitions, users, network);
+        sequence.install(verbose);
     }
     /**
      * return true if pv exist