penguins-eggs 10.0.50 → 10.0.52

package/dist/classes/distro.js

@@ -65,205 +65,230 @@ class Distro {
             this.distroId = "BigLinux";
         }
         /**
-         * Per Alpine, Fedora ed OpenSUSE basta distroId,
+         * Alpine, Fedora, openmamba, opensuse, VoidLinux solo distroId.
+         *
          * Debian, Devuan, Ubuntu e derivate ricadono in
          * default e si analizza il codebaseId
          *
          */
-        switch (this.distroId) {
+        if (this.distroId === 'ALDOS') {
+            this.familyId = 'aldos';
+            this.distroLike = 'ALDOS';
+            this.codenameId = 'rolling'; // viene rimosso dal nome
+            this.codenameLikeId = this.familyId; // per krill
+            this.liveMediumPath = '/run/initramfs/live/';
             /**
              * Alpine compatible
              */
-            case 'Alpine': {
-                this.familyId = 'alpine';
-                this.distroLike = this.distroId;
-                this.codenameId = 'rolling'; // viene rimosso dal nome
-                this.codenameLikeId = this.familyId; // per krill
-                this.liveMediumPath = '/mnt/'; // Qua è deciso da noi
-                break;
-            }
+        }
+        else if (this.distroId === 'Alpine') {
+            this.familyId = 'alpine';
+            this.distroLike = this.distroId;
+            this.codenameId = 'rolling'; // viene rimosso dal nome
+            this.codenameLikeId = this.familyId; // per krill
+            this.liveMediumPath = '/mnt/'; // Qua è deciso da noi
             /**
-             * Fedora compatible
+             * Arch
              */
-            case 'AlmaLinux':
-            case 'RockyLinux':
-            case 'Fedora': {
-                this.familyId = 'fedora';
-                this.distroLike = 'Fedora';
-                this.codenameId = 'rolling'; // viene rimosso dal nome
-                this.codenameLikeId = this.familyId; // per krill
-                this.liveMediumPath = '/run/initramfs/live/';
-                break;
-            }
+        }
+        else if (this.distroId === 'rolling' || this.distroId === 'n/a') {
+            this.familyId = 'archlinux';
+            this.distroLike = 'Arch';
+            this.codenameId = 'rolling';
+            this.codenameLikeId = 'rolling';
+            this.liveMediumPath = '/run/archiso/bootmnt/';
+            this.squashfs = `arch/x86_64/airootfs.sfs`;
+            /**
+             * Fedora/RHEL compatible
+             */
+        }
+        else if (this.distroId === 'AlmaLinux' ||
+            this.distroId === 'Fedora' ||
+            this.distroId === 'NobaraLinux' ||
+            this.distroId === 'RockyLinux') {
+            this.familyId = 'fedora';
+            this.distroLike = 'Fedora';
+            this.codenameId = 'rolling'; // viene rimosso dal nome
+            this.codenameLikeId = this.familyId; // per krill
+            this.liveMediumPath = '/run/initramfs/live/';
+            /**
+             * openmamba
+             */
+        }
+        else if (this.distroId === 'openmamba') {
+            this.familyId = 'openmamba';
+            this.distroLike = 'openmamba';
+            this.codenameId = 'rolling'; // viene rimosso dal nome
+            this.codenameLikeId = this.familyId; // per krill
+            this.liveMediumPath = '/run/initramfs/live/';
             /**
              * opensuse compatible
              */
-            case 'openSUSE': {
-                this.familyId = 'opensuse';
-                this.distroLike = this.distroId;
-                this.codenameId = 'rolling'; // viene rimosso dal nome
-                this.codenameLikeId = this.familyId; // per krill
-                this.liveMediumPath = '/run/initramfs/live/';
-                break;
-            }
+        }
+        else if (this.distroId === 'openSUSE') {
+            this.familyId = 'opensuse';
+            this.distroLike = this.distroId;
+            this.codenameId = 'rolling'; // viene rimosso dal nome
+            this.codenameLikeId = this.familyId; // per krill
+            this.liveMediumPath = '/run/initramfs/live/'; // check
             /**
              * voidlinux compatible
              */
-            case 'VoidLinux': {
-                this.familyId = 'voidlinux';
-                this.distroLike = this.distroId;
-                this.codenameId = 'rolling';
-                this.codenameLikeId = this.familyId; // per krill
-                this.liveMediumPath = '/run/initramfs/live/'; // we must discover
-                break;
-            }
+        }
+        else if (this.distroId === 'VoidLinux') {
+            this.familyId = 'voidlinux';
+            this.distroLike = this.distroId;
+            this.codenameId = 'rolling';
+            this.codenameLikeId = this.familyId; // per krill
+            this.liveMediumPath = '/run/initramfs/live/'; // we must discover
+        }
+        else {
             /**
-             * Arch/Debian/Devuan and Ubuntu
-             * analizzo i codebase conosciuti
+             * We must analize codenameId
              */
-            default: {
+            /**
+             * Debian jessie
+             */
+            if (this.codenameId === 'jessie') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'jessie';
+                this.liveMediumPath = '/lib/live/mount/medium/';
+                this.isCalamaresAvailable = false;
                 /**
-                 * Debian
+                 * Debian stretch
                  */
-                switch (this.codenameId) {
-                    case 'jessie': {
-                        this.distroLike = 'Debian';
-                        this.codenameLikeId = 'jessie';
-                        this.liveMediumPath = '/lib/live/mount/medium/';
-                        this.isCalamaresAvailable = false;
-                        break;
-                    }
-                    case 'stretch': {
-                        this.distroLike = 'Debian';
-                        this.codenameLikeId = 'stretch';
-                        this.liveMediumPath = '/lib/live/mount/medium/';
-                        this.isCalamaresAvailable = false;
-                        break;
-                    }
-                    case 'buster': {
-                        this.distroLike = 'Debian';
-                        this.codenameLikeId = 'buster';
-                        break;
-                    }
-                    case 'bullseye': {
-                        this.distroLike = 'Debian';
-                        this.codenameLikeId = 'bullseye';
-                        break;
-                    }
-                    case 'bookworm': {
-                        this.distroLike = 'Debian';
-                        this.codenameLikeId = 'bookworm';
-                        break;
-                    }
-                    case 'trixie': {
-                        this.distroLike = 'Debian';
-                        this.codenameLikeId = 'trixie';
-                        break;
-                    }
-                    /**
-                     * Devuan
-                     */
-                    case 'beowulf': {
-                        this.distroLike = 'Devuan';
-                        this.codenameLikeId = 'beowulf';
-                        break;
-                    }
-                    case 'chimaera': {
-                        this.distroLike = 'Devuan';
-                        this.codenameLikeId = 'chimaera';
-                        break;
-                    }
-                    case 'daedalus': {
-                        this.distroLike = 'Devuan';
-                        this.codenameLikeId = 'daedalus';
-                        break;
-                    }
-                    case 'excalibur': {
-                        this.distroLike = 'Devuan';
-                        this.codenameLikeId = 'excalibur';
-                        break;
-                    }
-                    /**
-                     * Ubuntu
-                     */
-                    case 'bionic': {
-                        this.distroLike = 'Ubuntu';
-                        this.codenameLikeId = 'bionic';
-                        this.liveMediumPath = '/lib/live/mount/medium/';
-                        break;
-                    }
-                    case 'focal': {
-                        this.distroLike = 'Ubuntu';
-                        this.codenameLikeId = 'focal';
-                        break;
-                    }
-                    case 'jammy': {
-                        this.distroLike = 'Ubuntu';
-                        this.codenameLikeId = 'jammy';
-                        break;
-                    }
-                    case 'noble': {
-                        this.distroLike = 'Ubuntu';
-                        this.codenameLikeId = 'noble';
-                        break;
-                    }
-                    // rhino
-                    case 'devel': {
-                        this.distroLike = 'Ubuntu';
-                        this.codenameLikeId = 'devel';
-                        break;
-                    }
-                    /**
-                     * Arch
-                     */
-                    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;
-                    }
-                    /**
-                     * derivatives
-                     */
-                    default: {
-                        /**
-                         * patch per Roy VERIFICARE
-                         */
-                        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;
-                                    }
-                                }
+            }
+            else if (this.codenameId === 'stretch') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'stretch';
+                this.liveMediumPath = '/lib/live/mount/medium/';
+                this.isCalamaresAvailable = false;
+                /**
+                 * Debian buster
+                 */
+            }
+            else if (this.codenameId === 'buster') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'buster';
+                /**
+                 * Debian bullseye
+                 */
+            }
+            else if (this.codenameId === 'bullseye') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'bullseye';
+                /**
+                 * Debian bookworm
+                 */
+            }
+            else if (this.codenameId === 'bookworm') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'bookworm';
+                /**
+                 * Debian trixie
+                 */
+            }
+            else if (this.codenameId === 'trixie') {
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'trixie';
+                /**
+                 * Devuan beowulf
+                 */
+            }
+            else if (this.codenameId === 'beowulf') {
+                this.distroLike = 'Devuan';
+                this.codenameLikeId = 'beowulf';
+                /**
+                 * Devuan chimaera
+                 */
+            }
+            else if (this.codenameId === 'chimaera') {
+                this.distroLike = 'Devuan';
+                this.codenameLikeId = 'chimaera';
+                /**
+                 * Devuan daedalus
+                 */
+            }
+            else if (this.codenameId === 'daedalus') {
+                this.distroLike = 'Devuan';
+                this.codenameLikeId = 'daedalus';
+                /**
+                 * Devuan excalibur
+                 */
+            }
+            else if (this.codenameId === 'excalibur') {
+                this.distroLike = 'Devuan';
+                this.codenameLikeId = 'excalibur';
+                /**
+                 * Ubuntu bionic
+                 */
+            }
+            else if (this.codenameId === 'bionic') {
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'bionic';
+                this.liveMediumPath = '/lib/live/mount/medium/';
+                /**
+                 * Ubuntu focal
+                 */
+            }
+            else if (this.codenameId === 'focal') {
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'focal';
+                /**
+                 * Ubuntu jammy
+                 */
+            }
+            else if (this.codenameId === 'jammy') {
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'jammy';
+                /**
+                 * Ubuntu noble
+                 */
+            }
+            else if (this.codenameId === 'noble') {
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'noble';
+                /**
+                 * Ubuntu devel
+                 */
+            }
+            else if (this.codenameId === 'devel') {
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'devel';
+            }
+            else {
+                /**
+                 * patch per Roy VERIFICARE
+                 */
+                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);
+                }
             }
-        } // Fine analisi distroId
+        }
         /**
          * Ultimi ritocchi
          */
@@ -274,6 +299,9 @@ class Distro {
         if (this.familyId === "debian") {
             this.usrLibPath = '/usr/lib/' + Utils.usrLibPath();
         }
+        else if (this.familyId === "opensuse") {
+            this.usrLibPath = '/usr/lib64/';
+        }
         /**
          * ManjaroLinux e derivate
          */
@@ -282,7 +310,7 @@ class Distro {
             this.squashfs = 'manjaro/x86_64/livefs.sfs';
         }
         /**
-         * lottura os_release per i pulsanti
+         * lettura os_release per i pulsanti
          */
         const os_release = '/etc/os-release';
         if (fs.existsSync(os_release)) {

package/dist/classes/diversions.d.ts

@@ -0,0 +1,38 @@
+/**
+ * ./src/classes/diversions.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+/**
+ * contiene le variazione di nome
+ * per ogni famiglia
+ */
+import { IDistro } from '../interfaces/index.js';
+export default class Diversions {
+    /**
+     *
+     * @param familyId
+     * @returns deluser
+     */
+    static deluser(familyId: string): string;
+    /**
+     *
+     * @param familyId
+     * @returns
+     */
+    static grubName(familyId: string): string;
+    /**
+     *
+     * @param familyId
+     * @param volid
+     * @returns
+     */
+    static kernelParameters(familyId: string, volid: string): string;
+    /**
+       *
+       * @returns
+       */
+    static distro(): IDistro;
+}

package/dist/classes/diversions.js

@@ -0,0 +1,107 @@
+/**
+ * ./src/classes/diversions.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import Distro from './distro.js';
+export default class Diversions {
+    /**
+     *
+     * @param familyId
+     * @returns deluser
+     */
+    static deluser(familyId) {
+        let deluser = 'deluser';
+        if (familyId === 'aldos' ||
+            familyId === 'archlinux' ||
+            familyId === 'fedora' ||
+            familyId === 'openmamba' ||
+            familyId === 'opensuse' ||
+            familyId === 'voidlinux') {
+            deluser = 'userdel';
+        }
+        return deluser;
+    }
+    /**
+     *
+     * @param familyId
+     * @returns
+     */
+    static grubName(familyId) {
+        let grubName = 'grub';
+        if (familyId === 'aldos' ||
+            familyId === 'fedora' ||
+            familyId === 'opensuse') {
+            grubName = 'grub2';
+        }
+        return grubName;
+    }
+    /**
+     *
+     * @param familyId
+     * @param volid
+     * @returns
+     */
+    static kernelParameters(familyId, volid) {
+        // GRUB_CMDLINE_LINUX='ipv6.disable=1'
+        let kp = "";
+        if (familyId === 'aldos') {
+            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs selinux=0 rootfstype=auto rd.locale.LANG=en_US.UTF-8 KEYBOARDTYPE=pc rd.vconsole.keymap=us rootflags=defaults,relatime,commit=60 nmi_watchdog=0 rhgb rd_NO_LUKS rd_NO_MD rd_NO_DM`;
+        }
+        else if (familyId === 'alpine') {
+            kp += `alpinelivelabel=${volid} alpinelivesquashfs=/mnt/live/filesystem.squashfs`;
+        }
+        else if (familyId === 'archlinux') {
+            kp += `boot=live components locales=${process.env.LANG}`;
+            const distroId = this.distro().distroId;
+            if (isMiso(distroId)) {
+                kp += ` misobasedir=manjaro misolabel=${volid}`;
+                // shx.exec(`mkdir -p ${this.settings.iso_work}.miso`)
+            }
+            else {
+                kp += ` archisobasedir=arch archisolabel=${volid}`;
+            }
+        }
+        else if (familyId === 'debian') {
+            kp += `boot=live components locales=${process.env.LANG} cow_spacesize=2G`;
+        }
+        else if (familyId === 'fedora') {
+            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs selinux=0`;
+        }
+        else if (familyId === 'openmamba') {
+            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs selinux=0`;
+        }
+        else if (familyId === 'opensuse') {
+            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs apparmor=0`;
+        }
+        else if (familyId === 'voidlinux') {
+            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs rd.debug`;
+        }
+        return kp;
+    }
+    /**
+       *
+       * @returns
+       */
+    static distro() {
+        return new Distro();
+    }
+}
+/**
+* isMiso
+*/
+function isMiso(distro) {
+    let found = false;
+    if (distro === 'ManjaroLinux' || distro === `BigLinux`) {
+        found = true;
+    }
+    return found;
+}
+/**
+ * isArchiso: se non zuppa, pan bagnato
+ */
+function isArchiso(distro) {
+    return !isMiso(distro);
+}

package/dist/classes/incubation/branding.js

@@ -34,16 +34,12 @@ export function branding(remix, distro, theme = '', verbose = false) {
      * to work on EFI
      */
     let bootloaderEntryName = '';
-    switch (distro.distroId.toLowerCase()) {
-        case 'devuan':
-        case 'lmde':
-        case 'syslinuxos': {
-            bootloaderEntryName = 'Debian';
-            break;
-        }
-        default: {
-            bootloaderEntryName = distro.distroId;
-        }
+    const distroId = distro.distroId.toLowerCase();
+    if (distroId === 'devuan' || distroId === 'lmde' || distroId === 'syslinuxos') {
+        bootloaderEntryName = 'Debian';
+    }
+    else {
+        bootloaderEntryName = distro.distroId;
     }
     const productLogo = `${remix.branding}-logo.png`;
     const productIcon = `${remix.branding}-logo.png`;

package/dist/classes/incubation/fisherman.d.ts

@@ -56,7 +56,7 @@ export default class Fisherman {
      */
     moduleFinished(): Promise<void>;
     /**
-     * Al momento rimane con la vecchia configurazione
+     * packages
      */
     modulePackages(distro: IDistro, release?: boolean): Promise<void>;
     /**
@@ -64,7 +64,7 @@ export default class Fisherman {
      */
     moduleRemoveuser(username: string): Promise<void>;
     /**
-     * Al momento rimane con la vecchia configurazione
+     * unpackFs
      */
     moduleUnpackfs(): Promise<void>;
 }