penguins-eggs 10.0.24 → 10.0.26

package/dist/classes/daddy.js

@@ -7,10 +7,10 @@
  */
 import chalk from 'chalk';
 import inquirer from 'inquirer';
+import yaml from 'js-yaml';
+import fs from 'node:fs';
 // _dirname
 import path from 'node:path';
-import fs from 'fs';
-import yaml from 'js-yaml';
 // We need to remove .js extension from import
 import Pacman from '../classes/pacman.js';
 import Settings from '../classes/settings.js';
@@ -18,6 +18,70 @@ import Utils from '../classes/utils.js';
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 export default class Daddy {
     settings = {};
+    /**
+     * editConfif
+     * @param c
+     * @returns
+     */
+    async editConfig(c) {
+        // Utils.titles('dad')
+        console.log(chalk.cyan('Edit and save Live system parameters'));
+        console.log();
+        let compressionOpt = 0;
+        if (c.compression === 'xz') {
+            compressionOpt = 1;
+        }
+        else if (c.compression === 'xz -Xbcj x86') {
+            compressionOpt = 2;
+        }
+        if (c.snapshot_prefix === '') {
+            c.snapshot_prefix = Utils.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
+        }
+        return new Promise((resolve) => {
+            const questions = [
+                {
+                    default: c.snapshot_prefix,
+                    message: 'LiveCD iso prefix: ',
+                    name: 'snapshot_prefix',
+                    type: 'input'
+                },
+                {
+                    default: c.snapshot_basename,
+                    message: 'LiveCD iso basename: ',
+                    name: 'snapshot_basename',
+                    type: 'input'
+                },
+                {
+                    default: c.user_opt,
+                    message: 'LiveCD user:',
+                    name: 'user_opt',
+                    type: 'input'
+                },
+                {
+                    default: c.user_opt_passwd,
+                    message: 'LiveCD user password: ',
+                    name: 'user_opt_passwd',
+                    type: 'input'
+                },
+                {
+                    default: c.root_passwd,
+                    message: 'LiveCD root password: ',
+                    name: 'root_passwd',
+                    type: 'input'
+                },
+                {
+                    choices: ['fast', 'max'],
+                    default: compressionOpt,
+                    message: 'LiveCD compression: ',
+                    name: 'compression',
+                    type: 'list'
+                }
+            ];
+            inquirer.prompt(questions).then((options) => {
+                resolve(JSON.stringify(options));
+            });
+        });
+    }
     /**
      *
      * @param reset
@@ -27,7 +91,7 @@ export default class Daddy {
      */
     async helpMe(reset = false, isCustom = false, fileCustom = '', verbose = false) {
         if (isCustom) {
-            console.log("using custom file: ", fileCustom);
+            console.log("using custom file:", fileCustom);
         }
         // Controllo configurazione
         if (!Pacman.configurationCheck()) {
@@ -94,68 +158,4 @@ export default class Daddy {
         console.log();
         console.log(chalk.cyan('More help? ') + chalk.white('eggs mom'));
     }
-    /**
-     * editConfif
-     * @param c
-     * @returns
-     */
-    async editConfig(c) {
-        // Utils.titles('dad')
-        console.log(chalk.cyan('Edit and save Live system parameters'));
-        console.log();
-        let compressionOpt = 0;
-        if (c.compression === 'xz') {
-            compressionOpt = 1;
-        }
-        else if (c.compression === 'xz -Xbcj x86') {
-            compressionOpt = 2;
-        }
-        if (c.snapshot_prefix === '') {
-            c.snapshot_prefix = Utils.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
-        }
-        return new Promise((resolve) => {
-            const questions = [
-                {
-                    default: c.snapshot_prefix,
-                    message: 'LiveCD iso prefix: ',
-                    name: 'snapshot_prefix',
-                    type: 'input'
-                },
-                {
-                    default: c.snapshot_basename,
-                    message: 'LiveCD iso basename: ',
-                    name: 'snapshot_basename',
-                    type: 'input'
-                },
-                {
-                    default: c.user_opt,
-                    message: 'LiveCD user:',
-                    name: 'user_opt',
-                    type: 'input'
-                },
-                {
-                    default: c.user_opt_passwd,
-                    message: 'LiveCD user password: ',
-                    name: 'user_opt_passwd',
-                    type: 'input'
-                },
-                {
-                    default: c.root_passwd,
-                    message: 'LiveCD root password: ',
-                    name: 'root_passwd',
-                    type: 'input'
-                },
-                {
-                    choices: ['fast', 'max'],
-                    default: compressionOpt,
-                    message: 'LiveCD compression: ',
-                    name: 'compression',
-                    type: 'list'
-                }
-            ];
-            inquirer.prompt(questions).then((options) => {
-                resolve(JSON.stringify(options));
-            });
-        });
-    }
 }

package/dist/classes/distro.js

@@ -104,219 +104,223 @@ class Distro {
         /**
          * Analize distroId
          */
-        if (this.distroId === 'Alpine') {
-            this.familyId = 'alpine';
-            this.distroLike = 'Alpine';
-            this.codenameId = 'rolling'; // questo viene rimosso dal nome
-            this.codenameLikeId = 'alpine'; // prende alpine come codebaneLikeId
-            this.liveMediumPath = '/mnt/'; // Qua è deciso da noi
-            //this.liveMediumPath = '/run/live/medium/'
-            this.squashfs = `live/filesystem.squashfs`;
-            this.syslinuxPath = '/usr/share/syslinux/'; //correct
-            this.pxelinuxPath = this.syslinuxPath;
-            this.usrLibPath = '/usr/lib/';
-            this.memdiskPath = this.syslinuxPath;
-            this.isolinuxPath = this.syslinuxPath;
-            // At the moment
-            this.isCalamaresAvailable = true;
-        }
-        else if (this.distroId === 'Fedora') {
-            this.familyId = 'fedora';
-            this.distroLike = 'Fedora';
-            this.codenameId = 'rolling';
-            this.codenameLikeId = '40';
-            this.liveMediumPath = '/run/install/repo/'; // ? è il mount della root su cd di installatione
-            this.squashfs = `live/filesystem.squashfs`;
-            this.syslinuxPath = '/usr/share/syslinux/';
-            this.pxelinuxPath = this.syslinuxPath;
-            this.usrLibPath = '/usr/lib/';
-            this.memdiskPath = this.syslinuxPath;
-            this.isolinuxPath = this.syslinuxPath;
-            // At the moment
-            this.isCalamaresAvailable = false;
-        }
-        else if (this.distroId === 'openSUSE') {
-            this.familyId = 'suse';
-            this.distroLike = 'openSUSE';
-            this.codenameId = 'rolling';
-            this.codenameLikeId = 'Tumbleweed';
-            this.liveMediumPath = '/run/install/repo/'; // ? è il mount della root su cd di installatione
-            this.squashfs = `live/filesystem.squashfs`;
-            this.syslinuxPath = '/usr/share/syslinux/';
-            this.pxelinuxPath = this.syslinuxPath;
-            this.usrLibPath = '/usr/lib/';
-            this.memdiskPath = this.syslinuxPath;
-            this.isolinuxPath = this.syslinuxPath;
-            // At the moment
-            this.isCalamaresAvailable = false;
-        }
-        else {
-            /**
-             * Arch/Debian/Devuan/Manjaro and Ubuntu
-             */
-            switch (this.codenameId) {
-                case 'jessie': {
-                    // Debian 8 jessie
-                    this.distroLike = 'Debian';
-                    this.codenameLikeId = 'jessie';
-                    this.liveMediumPath = '/lib/live/mount/medium/';
-                    this.isCalamaresAvailable = false;
-                    break;
-                }
-                case 'stretch': {
-                    // Debian 9 stretch
-                    this.distroLike = 'Debian';
-                    this.codenameLikeId = 'stretch';
-                    this.liveMediumPath = '/lib/live/mount/medium/';
-                    this.isCalamaresAvailable = false;
-                    break;
-                }
-                case 'buster': {
-                    // Debian 10 buster
-                    this.distroLike = 'Debian';
-                    this.codenameLikeId = 'buster';
-                    break;
-                }
-                case 'bullseye': {
-                    // Debian 11 bullseye
-                    this.distroLike = 'Debian';
-                    this.codenameLikeId = 'bullseye';
-                    break;
-                }
-                case 'bookworm': {
-                    // Debian 12 bookworm
-                    this.distroLike = 'Debian';
-                    this.codenameLikeId = 'bookworm';
-                    break;
-                }
-                case 'trixie': {
-                    // Debian 13 trixie
-                    this.distroLike = 'Debian';
-                    this.codenameLikeId = 'trixie';
-                    break;
-                }
-                case 'beowulf': {
-                    // Devuab 3 beowulf
-                    this.distroLike = 'Devuan';
-                    this.codenameLikeId = 'beowulf';
-                    break;
-                }
-                case 'chimaera': {
-                    // Devuab 4 chimaera
-                    this.distroLike = 'Devuan';
-                    this.codenameLikeId = 'chimaera';
-                    break;
-                }
-                case 'daedalus': {
-                    // Devuan 5 daedalus
-                    this.distroLike = 'Devuan';
-                    this.codenameLikeId = 'daedalus';
-                    break;
-                }
-                /**
-                 * Ubuntu LTS + actual
-                 */
-                case 'bionic': {
-                    // Ubuntu 18.04 bionic LTS eol aprile 2023
-                    this.distroLike = 'Ubuntu';
-                    this.codenameLikeId = 'bionic';
-                    this.liveMediumPath = '/lib/live/mount/medium/';
-                    break;
-                }
-                case 'focal': {
-                    // Ubuntu 20.04 focal LTS
-                    this.distroLike = 'Ubuntu';
-                    this.codenameLikeId = 'focal';
-                    break;
-                }
-                case 'jammy': {
-                    // Ubuntu 22.04 jammy LTS
-                    this.distroLike = 'Ubuntu';
-                    this.codenameLikeId = 'jammy';
-                    break;
-                }
-                case 'noble': {
-                    // Ubuntu 24.04 noble LTS
-                    this.distroLike = 'Ubuntu';
-                    this.codenameLikeId = 'noble';
-                    break;
-                }
-                case 'devel': {
-                    // Ubuntu rhino
-                    this.distroLike = 'Ubuntu';
-                    this.codenameLikeId = 'devel';
-                    break;
-                }
+        switch (this.distroId) {
+            case 'Alpine': {
+                this.familyId = 'alpine';
+                this.distroLike = 'Alpine';
+                this.codenameId = 'rolling'; // questo viene rimosso dal nome
+                this.codenameLikeId = 'alpine'; // prende alpine come codenaneLikeId
+                this.liveMediumPath = '/mnt/'; // Qua è deciso da noi
+                this.squashfs = `live/filesystem.squashfs`;
+                this.syslinuxPath = '/usr/share/syslinux/'; // correct
+                this.pxelinuxPath = this.syslinuxPath;
+                this.usrLibPath = '/usr/lib/';
+                this.memdiskPath = this.syslinuxPath;
+                this.isolinuxPath = this.syslinuxPath;
+                // At the moment
+                this.isCalamaresAvailable = false;
+                break;
+            }
+            case 'Fedora': {
+                this.familyId = 'fedora';
+                this.distroLike = 'Fedora';
+                this.codenameId = 'rolling';
+                this.codenameLikeId = '40';
+                this.liveMediumPath = '/run/install/repo/'; // ? è il mount della root su cd di installatione
+                this.squashfs = `live/filesystem.squashfs`;
+                this.syslinuxPath = '/usr/share/syslinux/';
+                this.pxelinuxPath = this.syslinuxPath;
+                this.usrLibPath = '/usr/lib/';
+                this.memdiskPath = this.syslinuxPath;
+                this.isolinuxPath = this.syslinuxPath;
+                // At the moment
+                this.isCalamaresAvailable = false;
+                break;
+            }
+            case 'openSUSE': {
+                this.familyId = 'suse';
+                this.distroLike = 'openSUSE';
+                this.codenameId = 'rolling';
+                this.codenameLikeId = 'Tumbleweed';
+                this.liveMediumPath = '/run/install/repo/'; // ? è il mount della root su cd di installatione
+                this.squashfs = `live/filesystem.squashfs`;
+                this.syslinuxPath = '/usr/share/syslinux/';
+                this.pxelinuxPath = this.syslinuxPath;
+                this.usrLibPath = '/usr/lib/';
+                this.memdiskPath = this.syslinuxPath;
+                this.isolinuxPath = this.syslinuxPath;
+                // At the moment
+                this.isCalamaresAvailable = false;
+                break;
+            }
+            default: {
                 /**
-                 * Arch Linux/Garuda
+                 * Arch/Debian/Devuan/Manjaro and Ubuntu
                  */
-                case 'Spizaetus':
-                case 'n/a':
-                case 'rolling': {
-                    this.familyId = 'archlinux';
-                    this.distroLike = 'Arch';
-                    this.codenameId = 'rolling';
-                    this.codenameLikeId = 'rolling';
-                    this.liveMediumPath = '/run/archiso/bootmnt/';
-                    this.squashfs = `arch/x86_64/airootfs.sfs`;
-                    break;
-                }
-                default: {
+                switch (this.codenameId) {
+                    case 'jessie': {
+                        // Debian 8 jessie
+                        this.distroLike = 'Debian';
+                        this.codenameLikeId = 'jessie';
+                        this.liveMediumPath = '/lib/live/mount/medium/';
+                        this.isCalamaresAvailable = false;
+                        break;
+                    }
+                    case 'stretch': {
+                        // Debian 9 stretch
+                        this.distroLike = 'Debian';
+                        this.codenameLikeId = 'stretch';
+                        this.liveMediumPath = '/lib/live/mount/medium/';
+                        this.isCalamaresAvailable = false;
+                        break;
+                    }
+                    case 'buster': {
+                        // Debian 10 buster
+                        this.distroLike = 'Debian';
+                        this.codenameLikeId = 'buster';
+                        break;
+                    }
+                    case 'bullseye': {
+                        // Debian 11 bullseye
+                        this.distroLike = 'Debian';
+                        this.codenameLikeId = 'bullseye';
+                        break;
+                    }
+                    case 'bookworm': {
+                        // Debian 12 bookworm
+                        this.distroLike = 'Debian';
+                        this.codenameLikeId = 'bookworm';
+                        break;
+                    }
+                    case 'trixie': {
+                        // Debian 13 trixie
+                        this.distroLike = 'Debian';
+                        this.codenameLikeId = 'trixie';
+                        break;
+                    }
+                    case 'beowulf': {
+                        // Devuab 3 beowulf
+                        this.distroLike = 'Devuan';
+                        this.codenameLikeId = 'beowulf';
+                        break;
+                    }
+                    case 'chimaera': {
+                        // Devuab 4 chimaera
+                        this.distroLike = 'Devuan';
+                        this.codenameLikeId = 'chimaera';
+                        break;
+                    }
+                    case 'daedalus': {
+                        // Devuan 5 daedalus
+                        this.distroLike = 'Devuan';
+                        this.codenameLikeId = 'daedalus';
+                        break;
+                    }
+                    /**
+                     * Ubuntu LTS + actual
+                     */
+                    case 'bionic': {
+                        // Ubuntu 18.04 bionic LTS eol aprile 2023
+                        this.distroLike = 'Ubuntu';
+                        this.codenameLikeId = 'bionic';
+                        this.liveMediumPath = '/lib/live/mount/medium/';
+                        break;
+                    }
+                    case 'focal': {
+                        // Ubuntu 20.04 focal LTS
+                        this.distroLike = 'Ubuntu';
+                        this.codenameLikeId = 'focal';
+                        break;
+                    }
+                    case 'jammy': {
+                        // Ubuntu 22.04 jammy LTS
+                        this.distroLike = 'Ubuntu';
+                        this.codenameLikeId = 'jammy';
+                        break;
+                    }
+                    case 'noble': {
+                        // Ubuntu 24.04 noble LTS
+                        this.distroLike = 'Ubuntu';
+                        this.codenameLikeId = 'noble';
+                        break;
+                    }
+                    case 'devel': {
+                        // Ubuntu rhino
+                        this.distroLike = 'Ubuntu';
+                        this.codenameLikeId = 'devel';
+                        break;
+                    }
                     /**
-                     * patch per Roy VERIFICARE
+                     * Arch Linux/Garuda
                      */
-                    let found = false;
-                    let file = path.resolve(__dirname, '../../conf/derivatives.yaml');
-                    if (fs.existsSync('/etc/penguins-eggs.d/derivatives.yaml')) {
-                        file = '/etc/penguins-eggs.d/derivatives.yaml';
+                    case 'Spizaetus':
+                    case 'n/a':
+                    case 'rolling': {
+                        this.familyId = 'archlinux';
+                        this.distroLike = 'Arch';
+                        this.codenameId = 'rolling';
+                        this.codenameLikeId = 'rolling';
+                        this.liveMediumPath = '/run/archiso/bootmnt/';
+                        this.squashfs = `arch/x86_64/airootfs.sfs`;
+                        break;
                     }
-                    const content = fs.readFileSync(file, 'utf8');
-                    const distros = yaml.load(content);
-                    for (const distro of distros) {
-                        if (distro.ids !== undefined) {
-                            for (let n = 0; n < distro.ids.length; n++) {
-                                if (this.codenameId === distro.ids[n]) {
-                                    found = true;
-                                    this.distroLike = distro.distroLike;
-                                    this.codenameLikeId = distro.id;
-                                    this.familyId = distro.family;
+                    default: {
+                        /**
+                         * patch per Roy VERIFICARE
+                         */
+                        let found = false;
+                        let file = path.resolve(__dirname, '../../conf/derivatives.yaml');
+                        if (fs.existsSync('/etc/penguins-eggs.d/derivatives.yaml')) {
+                            file = '/etc/penguins-eggs.d/derivatives.yaml';
+                        }
+                        const content = fs.readFileSync(file, 'utf8');
+                        const distros = yaml.load(content);
+                        for (const distro of distros) {
+                            if (distro.ids !== undefined) {
+                                for (let n = 0; n < distro.ids.length; n++) {
+                                    if (this.codenameId === distro.ids[n]) {
+                                        found = true;
+                                        this.distroLike = distro.distroLike;
+                                        this.codenameLikeId = distro.id;
+                                        this.familyId = distro.family;
+                                    }
                                 }
                             }
                         }
-                    }
-                    if (!found) {
-                        console.log(`This distro ${this.distroId}/${this.codenameId} is not yet recognized!`);
-                        console.log('');
-                        console.log('You can edit /usr/lib/penguins-eggs/conf/derivatives.yaml to add it -');
-                        console.log('after that - run: sudo eggs dad -d to re-configure eggs.');
-                        console.log('If you can create your new iso, you can contribute to the project');
-                        console.log('by suggesting your modification.');
-                        process.exit(0);
+                        if (!found) {
+                            console.log(`This distro ${this.distroId}/${this.codenameId} is not yet recognized!`);
+                            console.log('');
+                            console.log('You can edit /usr/lib/penguins-eggs/conf/derivatives.yaml to add it -');
+                            console.log('after that - run: sudo eggs dad -d to re-configure eggs.');
+                            console.log('If you can create your new iso, you can contribute to the project');
+                            console.log('by suggesting your modification.');
+                            process.exit(0);
+                        }
                     }
                 }
+                /**
+                 * setting paths: syslinux, isolinux, usrLibPath
+                 */
+                switch (this.familyId) {
+                    case 'debian': {
+                        this.isolinuxPath = '/usr/lib/ISOLINUX/';
+                        this.syslinuxPath = '/usr/lib/syslinux/modules/bios/';
+                        this.pxelinuxPath = '/usr/lib/PXELINUX/';
+                        this.memdiskPath = '/usr/lib/syslinux/';
+                        this.usrLibPath = '/usr/lib/' + Utils.usrLibPath();
+                        break;
+                    }
+                    case 'archlinux': {
+                        this.syslinuxPath = '/usr/lib/syslinux/bios/';
+                        this.pxelinuxPath = this.syslinuxPath;
+                        this.usrLibPath = '/usr/lib/';
+                        this.memdiskPath = this.syslinuxPath;
+                        this.isolinuxPath = this.syslinuxPath;
+                        break;
+                    }
+                    // No default
+                } // Fine analisi codenameId
             }
-            /**
-             * setting paths: syslinux, isolinux, usrLibPath
-             */
-            switch (this.familyId) {
-                case 'debian': {
-                    this.isolinuxPath = '/usr/lib/ISOLINUX/';
-                    this.syslinuxPath = '/usr/lib/syslinux/modules/bios/';
-                    this.pxelinuxPath = '/usr/lib/PXELINUX/';
-                    this.memdiskPath = '/usr/lib/syslinux/';
-                    this.usrLibPath = '/usr/lib/' + Utils.usrLibPath();
-                    break;
-                }
-                case 'archlinux': {
-                    this.syslinuxPath = '/usr/lib/syslinux/bios/';
-                    this.pxelinuxPath = this.syslinuxPath;
-                    this.usrLibPath = '/usr/lib/';
-                    this.memdiskPath = this.syslinuxPath;
-                    this.isolinuxPath = this.syslinuxPath;
-                    break;
-                }
-                // No default
-            } // Fine analisi codenameId
         }
         /**
          * if lsb-release exists

package/dist/classes/families/alpine.js

@@ -20,7 +20,7 @@ export default class Alpine {
     static async calamaresInstall(verbose = false) {
         const echo = Utils.setEcho(verbose);
         try {
-            let cmd = `apk add ${this.packs4calamares}`;
+            const cmd = `apk add ${this.packs4calamares}`;
             try {
                 await exec(cmd, echo);
             }
@@ -44,7 +44,7 @@ export default class Alpine {
      */
     static async calamaresRemove(verbose = true) {
         verbose = true; // serve per pacman
-        let removed = true;
+        const removed = true;
         const echo = Utils.setEcho(verbose);
         await exec(`apk del ${this.packs4calamares}`);
         await exec('rm /etc/calamares -rf', echo);

package/dist/classes/incubation/incubator.js

@@ -14,8 +14,8 @@ import Pacman from '../pacman.js';
 import Utils from '../utils.js';
 import { Bionic } from './distros/bionic.js';
 import { Buster } from './distros/buster.js';
-import { Noble } from './distros/noble.js';
 import { Jessie } from './distros/jessie.js';
+import { Noble } from './distros/noble.js';
 import { Rolling } from './distros/rolling.js';
 import { installer } from './installer.js';
 // _dirname

package/dist/classes/keyboards.d.ts

@@ -16,7 +16,7 @@ export default class Keyboard {
     variants: string[];
     constructor();
     /**
-     * XKBLAYOUT='us' OK Alpine
+     * XKBLAYOUT='us'
      */
     getLayout(): Promise<string>;
     /**

package/dist/classes/keyboards.js

@@ -77,9 +77,24 @@ export default class Keyboard {
                 }
             }
         }
+        else {
+            this.models.push('pc105');
+            this.layouts = [
+                'af', 'al', 'am', 'ara', 'at', 'az', 'ba', 'bd', 'be', 'bg', 'br',
+                'brai', 'by', 'ca', 'ch', 'cm', 'cn', 'cz', 'de', 'dk', 'dz', 'ee',
+                'epo', 'fr', 'gb', 'ge', 'gh', 'gr', 'hr', 'hu', 'id', 'ie', 'il',
+                'in', 'iq', 'ir', 'is', 'it', 'jp', 'ke', 'kg', 'kr', 'kz', 'la',
+                'latam', 'lk', 'lt', 'lv', 'ma', 'md', 'me', 'mk', 'ml', 'mm',
+                'mt', 'my', 'ng', 'nl', 'no', 'nz', 'ph', 'pk', 'pl', 'pt', 'ro',
+                'rs', 'ru', 'se', 'si', 'sk', 'sy', 'th', 'tj', 'tw', 'ua',
+                'us', 'uz', 'vn'
+            ];
+            this.variants.push('none');
+            this.options.push('none');
+        }
     }
     /**
-     * XKBLAYOUT='us' OK Alpine
+     * XKBLAYOUT='us'
      */
     async getLayout() {
         const file = '/etc/default/keyboard';