penguins-eggs 9.1.31 → 9.1.34

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/{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

package/lib/krill/krill-sequence.d.ts

@@ -0,0 +1,148 @@
+/**
+ * penguins-eggs: krill_sequence
+ *
+ * author: Piero Proietti
+ * mail: piero.proietti@gmail.com
+ *
+ */
+/**
+ * Note: I'm using REACT here to get a TUI,
+ *       via ink library https://github.com/vadimdemedes/ink
+ */
+/**
+ * Ideally, I want to respect calamares way, remplementing the same (SEMPLIFIED) steps for CLI
+ *
+ * Phase 2 - install.
+ *
+ *  - partition:     partitions
+ *  - mount:         mountFs, mountVfs
+ *  - unpackfs:      unpackfs
+ *  - _restore:      eggs syncfrom --rootdir /tmp/calamares-krill-root/
+ *  - sources-yolk:  execCalamaresModule('sources-yolk')
+ *  - machineid:     machineid
+ *  - fstab:         fstab
+ *  - locale         locale
+ *  - keyboard:      keyboard
+ *  - localecfg:     localecfg
+ *  - users:         users
+ *  - displaymanager: autologin
+ *  - networkcfg:    networkcfg
+ *  - hwclock:
+ *  - services-systemd:
+ *  - bootloader-config: execCalamaresModule('bootloader-config')
+ *  - grubcfg:       grubcfg
+ *  - bootloader:    bootloaded
+ *  - packages:      removeInstaller
+ *  - luksbootkeyfile:
+ *  - plymouthcfg;
+ *  - initramfscfg:  initramfscfg
+ *  - initramfs:     initramfs
+ *  - removeuser:    removeuser
+ *  - sources-yolk-unmount: execCalamaresModule('sources-yolk-unmount')
+ *  - umount:     umountVfs, this.umountFs
+ */
+import { IRemix, IDistro, INet } from '../interfaces';
+import Settings from '../classes/settings';
+import { IInstaller, IDevices } from '../interfaces';
+import { ILocation, IKeyboard, IPartitions, IUsers } from '../interfaces/i-krill';
+import partition from './modules/partitions';
+import { mountFs, umountFs } from './modules/mount-fs';
+import { mountVfs, umountVfs } from './modules/mount-vfs';
+import unpackfs from './modules/unpackfs';
+import machineId from './modules/machine-id';
+import fstab from './modules/fstab';
+import locale from './modules/locale';
+import setKeyboard from './modules/set-keyboard';
+import localeCfg from './modules/lòcale-cfg';
+import addUser from './modules/add-user';
+import changePassword from './modules/change-password';
+import networkCfg from './modules/network-cfg';
+import bootloaderConfig from './modules/bootloader-config';
+import bootloaderConfigArch from './modules/bootloader-config-arch';
+import bootloaderConfigUbuntu from './modules/bootloader-config-ubuntu';
+import grubcfg from './modules/grubcfg';
+import bootloader from './modules/bootloader';
+import removeInstallerLink from './modules/remove-installer-link';
+import initramfsCfg from './modules/initramfs-cfg';
+import initramfs from './modules/initramfs';
+import delLiveUser from './modules/del-live-user';
+import setTimezone from './modules/set-timezone';
+import umount from './modules/umount';
+import mkfs from './modules/mkfs';
+import hostname from './modules/hostname';
+import hosts from './modules/hosts';
+/**
+ * hatching: installazione o cova!!!
+ */
+export default class Sequence {
+    partition: typeof partition;
+    mountFs: typeof mountFs;
+    mountVfs: typeof mountVfs;
+    unpackfs: typeof unpackfs;
+    machineId: typeof machineId;
+    fstab: typeof fstab;
+    locale: typeof locale;
+    setKeyboard: typeof setKeyboard;
+    localeCfg: typeof localeCfg;
+    addUser: typeof addUser;
+    changePassword: typeof changePassword;
+    networkCfg: typeof networkCfg;
+    bootloaderConfig: typeof bootloaderConfig;
+    bootloaderConfigArch: typeof bootloaderConfigArch;
+    bootloaderConfigUbuntu: typeof bootloaderConfigUbuntu;
+    grubcfg: typeof grubcfg;
+    bootloader: typeof bootloader;
+    removeInstallerLink: typeof removeInstallerLink;
+    initramfsCfg: typeof initramfsCfg;
+    initramfs: typeof initramfs;
+    delLiveUser: typeof delLiveUser;
+    umountFs: typeof umountFs;
+    umountVfs: typeof umountVfs;
+    setTimezone: typeof setTimezone;
+    umount: typeof umount;
+    mkfs: typeof mkfs;
+    hostname: typeof hostname;
+    hosts: typeof hosts;
+    installer: IInstaller;
+    installTarget: string;
+    verbose: boolean;
+    echo: {};
+    efi: boolean;
+    devices: IDevices;
+    users: IUsers;
+    network: INet;
+    partitions: IPartitions;
+    language: string;
+    region: string;
+    zone: string;
+    keyboardModel: string;
+    keyboardLayout: string;
+    keyboardVariant: string;
+    toNull: string;
+    settings: Settings;
+    remix: IRemix;
+    distro: IDistro;
+    luksName: string;
+    luksFile: string;
+    luksDevice: string;
+    luksMountpoint: string;
+    /**
+     * constructor
+     */
+    constructor(location: ILocation, keyboard: IKeyboard, partitions: IPartitions, users: IUsers, network: INet);
+    /**
+     * install
+     * @param verbose
+     * @param umount
+     * @returns
+     */
+    install(verbose?: boolean): Promise<void>;
+    /**
+     *
+     */
+    execCalamaresModule(name: string): Promise<void>;
+    /**
+     * only show the result
+     */
+    finished(): Promise<void>;
+}