penguins-eggs 10.0.19 → 10.0.20

package/.oclif.manifest.json

@@ -1461,5 +1461,5 @@
       ]
     }
   },
-  "version": "10.0.19"
+  "version": "10.0.20"
 }

package/README.md

@@ -486,7 +486,7 @@ EXAMPLES
   $ eggs adapt
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -507,7 +507,7 @@ EXAMPLES
   sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -538,7 +538,7 @@ EXAMPLES
   $ eggs autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.1.7/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.1.8/src/commands/autocomplete/index.ts)_
 
 ## `eggs calamares`
 
@@ -571,7 +571,7 @@ EXAMPLES
   sudo eggs calamares --remove
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -598,7 +598,7 @@ EXAMPLES
   sudo eggs config --clean --nointeractive
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/config.ts)_
 
 ## `eggs cuckoo`
 
@@ -618,7 +618,7 @@ EXAMPLES
   sudo eggs cuckoo
 ```
 
-_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/cuckoo.ts)_
+_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -646,7 +646,7 @@ EXAMPLES
   sudo dad --default
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -673,7 +673,7 @@ EXAMPLES
   $ eggs export deb --all
 ```
 
-_See code: [src/commands/export/deb.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/export/deb.ts)_
+_See code: [src/commands/export/deb.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/export/deb.ts)_
 
 ## `eggs export iso`
 
@@ -698,7 +698,7 @@ EXAMPLES
   $ eggs export iso --clean
 ```
 
-_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/export/iso.ts)_
+_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/export/iso.ts)_
 
 ## `eggs help [COMMAND]`
 
@@ -759,7 +759,7 @@ EXAMPLES
   sudo eggs install --chroot
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -782,7 +782,7 @@ EXAMPLES
   sudo eggs kill
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -841,7 +841,7 @@ EXAMPLES
   $ eggs mom
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -898,7 +898,7 @@ EXAMPLES
   sudo eggs produce --excludes home    # exclude ~/*
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -919,7 +919,7 @@ EXAMPLES
   $ eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -945,7 +945,7 @@ EXAMPLES
   sudo eggs syncfrom --file /path/to/luks-volume
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -972,7 +972,7 @@ EXAMPLES
   sudo eggs syncto --excludes
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -994,7 +994,7 @@ EXAMPLES
   sudo eggs tools clean
 ```
 
-_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/tools/clean.ts)_
+_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/tools/clean.ts)_
 
 ## `eggs tools ppa`
 
@@ -1020,7 +1020,7 @@ EXAMPLES
   sudo eggs tools ppa --remove
 ```
 
-_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/tools/ppa.ts)_
+_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/tools/ppa.ts)_
 
 ## `eggs tools skel`
 
@@ -1044,7 +1044,7 @@ EXAMPLES
   sudo eggs tools skel --user user-to-be-copied
 ```
 
-_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/tools/skel.ts)_
+_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/tools/skel.ts)_
 
 ## `eggs tools stat`
 
@@ -1070,7 +1070,7 @@ EXAMPLES
   $ eggs tools stat --year
 ```
 
-_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/tools/stat.ts)_
+_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/tools/stat.ts)_
 
 ## `eggs tools yolk`
 
@@ -1091,7 +1091,7 @@ EXAMPLES
   sudo eggs tools yolk
 ```
 
-_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/tools/yolk.ts)_
+_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/tools/yolk.ts)_
 
 ## `eggs update`
 
@@ -1112,7 +1112,7 @@ EXAMPLES
   $ eggs update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/update.ts)_
 
 ## `eggs version`
 
@@ -1158,7 +1158,7 @@ EXAMPLES
   $ eggs wardrobe get your-wardrobe
 ```
 
-_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/wardrobe/get.ts)_
+_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/wardrobe/get.ts)_
 
 ## `eggs wardrobe list [REPO]`
 
@@ -1187,7 +1187,7 @@ EXAMPLES
   $ eggs wardrobe list --distro arch
 ```
 
-_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/wardrobe/list.ts)_
+_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/wardrobe/list.ts)_
 
 ## `eggs wardrobe show [REPO]`
 
@@ -1217,7 +1217,7 @@ EXAMPLES
   $ eggs wardrobe show accessories/
 ```
 
-_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/wardrobe/show.ts)_
+_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/wardrobe/show.ts)_
 
 ## `eggs wardrobe wear [REPO]`
 
@@ -1248,7 +1248,7 @@ EXAMPLES
   sudo eggs wardrobe wear wagtail/waydroid
 ```
 
-_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.19/src/commands/wardrobe/wear.ts)_
+_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.20/src/commands/wardrobe/wear.ts)_
 <!-- commandsstop -->
 
 # penGUI

package/dist/classes/distro.js

@@ -102,191 +102,202 @@ class Distro {
             this.releaseLike = 'unstable';
         }
         /**
-         * Analisi: codenameId
+         * Analize distroId
          */
-        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;
-            }
+        if (this.distroId === 'Alpine') {
+            this.familyId = 'alpine';
+            this.distroLike = 'Alpine';
+            this.codenameId = 'rolling'; // questo viene rimosso dal nome
+            this.codenameLikeId = 'alpine-rolling';
+            this.liveMediumPath = '/.modloop/'; // ? è il mount della root su cd di installatione
+            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;
+        }
+        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;
+        }
+        else {
             /**
-             * Arch Linux/Garuda
+             * Arch/Debian/Devuan/Manjaro and Ubuntu
              */
-            case 'Spizaetus':
-            case 'n/a':
-            case 'rolling': {
-                if (this.distroId === "Alpine") {
-                    // Alpine
-                    this.familyId = 'alpine';
-                    this.distroLike = 'Alpine';
-                    this.codenameId = 'rolling'; // questo viene rimosso dal nome
-                    this.codenameLikeId = 'alpine-rolling';
-                    this.liveMediumPath = '/.modloop/'; // ? è il mount della root su cd di installatione
-                    this.squashfs = `to/define/filestem.squashfs`;
+            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;
                 }
-                else {
-                    // Arch,  ArcoLinux, BlendOS, EndeavourOS, Garuda, RebornOS
+                /**
+                 * 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;
+                }
+                /**
+                 * Arch Linux/Garuda
+                 */
+                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;
                 }
-                break;
-            }
-            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;
+                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;
-            }
-            case 'alpine': {
-                this.syslinuxPath = '/usr/share/syslinux/'; //correct
-                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/fedora.js

@@ -24,7 +24,7 @@ export default class Fedora {
             await exec(`dnf install ${this.packs4calamares.join(' ')}`, echo);
         }
         catch {
-            Utils.error(`Fedora.calamaresInstall() pacman -Sy ${this.packs4calamares.join(' ')}`); // + e.error)
+            Utils.error(`fedora.calamaresInstall()`);
         }
     }
     /**
@@ -42,8 +42,7 @@ export default class Fedora {
         if (fs.existsSync('/etc/calamares')) {
             await exec('rm /etc/calamares -rf', echo);
         }
-        // yay???
-        await exec('yay -Rns calamares', echo);
+        await exec('dnf remove calamares', echo);
         return retVal;
     }
     /**
@@ -91,7 +90,6 @@ export default class Fedora {
      */
     static packageIsInstalled(packageName) {
         let installed = false;
-        // rpm -qa | grep -i nano
         const cmd = `/usr/bin/dnf list --installed ${packageName}`;
         const stdout = shx.exec(cmd, { silent: true }).stdout.trim();
         if (stdout.includes(packageName)) {

package/dist/classes/ovary.d.ts

@@ -83,18 +83,22 @@ export default class Ovary {
      */
     finished(scriptOnly?: boolean): void;
     /**
-     * initrdArch()
-     * necessita di echoYes
+     * initrdAlpine()
      */
-    initrdArch(): Promise<void>;
+    initrdAlpine(): Promise<void>;
+    /**
+     * initrdFedora()
+     */
+    initrdFedora(): Promise<void>;
     /**
      * initrdArch()
      * necessita di echoYes
      */
-    initrdAlpine(): Promise<void>;
+    initrdArch(): Promise<void>;
     /**
+     * initrdDebian()
+     * Actually based on live* packages
      * We must upgrade to initrdCreate for Debian/Ubuntu
-     * @returns
      */
     initrdDebian(verbose?: boolean): Promise<void>;
     /**

package/dist/classes/ovary.js

@@ -703,15 +703,28 @@ export default class Ovary {
             console.log(`Note: format UDF, generated by ${chalk.cyanBright('genisoimage')}`);
         }
     }
+    /**
+     * initrdAlpine()
+     */
+    async initrdAlpine() {
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Alpine on ISO/live`);
+        await exec(`cp /boot/initramfs-lts ${this.settings.iso_work}/live/`, this.echo);
+    }
+    /**
+     * initrdFedora()
+     */
+    async initrdFedora() {
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Fedora on ISO/live`);
+        await exec(`cp /boot/initramfs-* ${this.settings.iso_work}/live/`, this.echo);
+    }
     /**
      * initrdArch()
      * necessita di echoYes
      */
     async initrdArch() {
-        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} on ISO/live`);
         let initrdImg = Utils.initrdImg();
         initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
-        Utils.warning(`Creating ${initrdImg} in ${this.settings.iso_work}live/`);
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} ArchLinux on ISO/live`);
         const { distroId } = this.settings.distro;
         let fileConf = 'arch';
         if (isMiso(distroId)) {
@@ -724,26 +737,12 @@ export default class Ovary {
         await exec(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
     }
     /**
-     * initrdArch()
-     * necessita di echoYes
-     */
-    async initrdAlpine() {
-        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} on ISO/live`);
-        let initrdImg = Utils.initrdImg();
-        //initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1))
-        Utils.warning(`Creating ${initrdImg} in ${this.settings.iso_work}live/`);
-        const { distroId } = this.settings.distro;
-        // da cambiare ...
-        let fileConf = 'arch';
-        const pathConf = path.resolve(__dirname, `../../mkinitcpio/${fileConf}/live.conf`);
-        await exec(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}live/${initrdImg}`, Utils.setEcho(true));
-    }
-    /**
+     * initrdDebian()
+     * Actually based on live* packages
      * We must upgrade to initrdCreate for Debian/Ubuntu
-     * @returns
      */
     async initrdDebian(verbose = false) {
-        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} on ISO/live`);
+        Utils.warning(`creating ${path.basename(this.settings.initrdImg)} Debian/Devuan/Ubuntu on ISO/live`);
         let isCrypted = false;
         if (fs.existsSync('/etc/crypttab')) {
             isCrypted = true;
@@ -1446,15 +1445,21 @@ export default class Ovary {
                 await this.isolinux(this.theme);
                 await this.kernelCopy();
                 /**
-                 * we need different behaviour on
-                 * initrd for different familis
+                 * we need different initfs
+                 * for different families
                  */
-                if (this.familyId === 'debian') {
-                    await this.initrdDebian();
-                }
-                else if (this.familyId === 'archlinux') {
+                if (this.familyId === 'archlinux') {
                     await this.initrdArch();
                 }
+                else if (this.familyId === 'alpine') {
+                    await this.initrdAlpine();
+                }
+                else if (this.familyId === 'fedora') {
+                    await this.initrdFedora();
+                }
+                else if (this.familyId === 'debian') {
+                    await this.initrdDebian();
+                }
                 if (this.settings.config.make_efi) {
                     await this.makeEfi(this.theme);
                 }

package/dist/classes/utils.d.ts

@@ -11,10 +11,10 @@
  */
 export default class Utils {
     /**
-  * Custom function to sort object keys
-  * @param obj
-  * @returns
-  */
+    * Custom function to sort object keys
+    * @param obj
+    * @returns
+    */
     static sortObjectKeys(obj: {
         [key: string]: any;
     }): {

package/dist/classes/utils.js

@@ -29,11 +29,10 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
  */
 export default class Utils {
     /**
-  * Custom function to sort object keys
-  * @param obj
-  * @returns
-  */
-    // 
+    * Custom function to sort object keys
+    * @param obj
+    * @returns
+    */
     static sortObjectKeys(obj) {
         const sorted = {};
         Object.keys(obj)
@@ -110,14 +109,19 @@ export default class Utils {
     static vmlinuz() {
         let distro = new Distro();
         let vmlinuz = '';
-        // patch per raspberry arm64
         // find vmlinuz in /proc/cmdline
         const cmdline = fs.readFileSync('/proc/cmdline', 'utf8').split(" ");
         cmdline.forEach(cmd => {
             if (cmd.includes('BOOT_IMAGE')) {
                 vmlinuz = cmd.substring(cmd.indexOf('=') + 1);
-                if (!fs.existsSync(vmlinuz) && fs.existsSync(`/boot${vmlinuz}`)) {
-                    vmlinuz = `/boot${vmlinuz}`;
+                // patch per fedora BOOT_IMAGE=(hd0,gpt2)/vmlinuz-6.9.9-200.fc40.x86_64
+                if (vmlinuz.includes(")")) {
+                    vmlinuz = cmd.substring(cmd.indexOf(')') + 1);
+                }
+                if (!fs.existsSync(vmlinuz)) {
+                    if (fs.existsSync(`/boot/${vmlinuz}`)) {
+                        vmlinuz = `/boot/${vmlinuz}`;
+                    }
                 }
             }
         });

package/manpages/doc/man/eggs.html

@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
   <body>
-    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.19</h1>
+    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.20</h1>
     <h1>SYNOPSIS</h1>
     <p>Install Debian families (debian/devuan/ubuntu)</p>
-    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.19-bionic-1_amd64.deb
+    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.20-1_i386.deb
 </code></pre>
     <p>Install Arch families (Arch, manjaro Linux)</p>
     <p>Arch from AUR</p>
@@ -30,7 +30,7 @@ $ makepkg -si
     <h1>USAGE</h1>
     <pre><code>$ eggs (-v|--version|version)
 
-penguins-eggs/10.0.19  
+penguins-eggs/10.0.20  
 $ eggs --help [COMMAND]
 
 USAGE

package/mkinitcpio/README.md

@@ -1,4 +1,4 @@
-# Hic sunt leones!
+# Arch families
 
 After Debian/Devuan/Ubuntu I decided to bring eggs under Arch and thanx to the collaboration of stefano@manjaro.com we was able to remaster linuxmanjaro since january 2022.
 

package/package.json

@@ -2,15 +2,15 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "10.0.19",
+  "version": "10.0.20",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
   },
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
-    "@oclif/core": "^4.0.12",
-    "@oclif/plugin-autocomplete": "^3.1.7",
+    "@oclif/core": "^4.0.13",
+    "@oclif/plugin-autocomplete": "^3.1.8",
     "@oclif/plugin-help": "^6.2.6",
     "@oclif/plugin-version": "^2.2.8",
     "axios": "^1.7.2",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^4.0.4",
+    "@oclif/test": "^4.0.5",
     "@types/chai": "^4.3.16",
     "@types/inquirer": "^9.0.7",
     "@types/js-yaml": "^4.0.9",
@@ -47,7 +47,7 @@
     "eslint-config-oclif-typescript": "^3.1.8",
     "eslint-config-prettier": "^9.1.0",
     "mocha": "^10.6.0",
-    "oclif": "^4.14.6",
+    "oclif": "^4.14.8",
     "perrisbrewery": "^10.0.1",
     "prettier": "^3.3.3",
     "shx": "^0.3.4",

package/scripts/_eggs

@@ -323,7 +323,6 @@ _arguments -S \
 --theme"[theme for livecd, calamares branding and partitions]:file:_files" \
 "(-u --unsecure)"{-u,--unsecure}"[/root contents are included on live]" \
 "(-v --verbose)"{-v,--verbose}"[verbose]" \
-"(-U --udf)"{-U,--udf}"[use UDF format on ISO with genisoimage breacking 4.7 G limit]" \
 "(-y --yolk)"{-y,--yolk}"[force yolk renew]" \
 --help"[Show help for command]" \
 "*: :_files" ;; 

package/scripts/eggs.bash

@@ -23,7 +23,7 @@ install --btrfs --chroot --crypted --domain --halt --help --ip --nointeractive -
 krill --btrfs --chroot --crypted --domain --halt --help --ip --nointeractive --none --pve --random --small --suspend --unattended --verbose
 kill --help --isos --nointeractive --verbose
 mom --help
-produce --addons --basename --clone --cryptedclone --excludes --help --links --max --noicon --nointeractive --pendrive --prefix --release --script --standard --theme --unsecure --verbose --udf --yolk
+produce --addons --basename --clone --cryptedclone --excludes --help --links --max --noicon --nointeractive --pendrive --prefix --release --script --standard --theme --unsecure --verbose --yolk
 status --help --verbose
 syncfrom --delete --file --help --rootdir --verbose
 syncto --excludes --file --help --verbose

package/dist/classes/initrd.d.ts

@@ -1,41 +0,0 @@
-/**
- * ./src/classes/initrd.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-import { IInitrd } from '../interfaces/index.js';
-/**
- * initrd
- * Controlla e rimuove, se necessario cryptroot, resume
- * cryptsetup
- */
-export default class Initrd {
-    compression: string;
-    fsLive: string;
-    initrdDest: string;
-    initrdSrc: string;
-    workDir: string;
-    constructor(initrdSrc?: string, initrdDest?: string, fsLive?: string);
-    /**
-     * Check initrd for cryptroot, resume, cryptsetup.
-     */
-    check(): IInitrd;
-    /**
-     * clean
-     */
-    clean(): void;
-    /**
-     * extract
-     */
-    extract(initrd?: string, verbose?: boolean): Promise<void>;
-    /**
-     * edit
-     */
-    private edit;
-    /**
-     * rebuild
-     */
-    private rebuild;
-}

package/dist/classes/initrd.js

@@ -1,152 +0,0 @@
-/**
- * ./src/classes/initrd.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-/**
- * Schema from "refractasnapshot-10.2.10 (20191218)"
- * Copyright: fsmithred@gmail.com 2011-2019
- */
-// packages
-import fs from 'node:fs';
-import shx from 'shelljs';
-/**
- * initrd
- * Controlla e rimuove, se necessario cryptroot, resume
- * cryptsetup
- */
-export default class Initrd {
-    compression = 'gzip';
-    fsLive = '/home/eggs/ovarium/filesystem';
-    initrdDest = '/home/eggs/ovarium/iso/live';
-    initrdSrc = '/initrd.img';
-    workDir = '/tmp/initrd-extracted';
-    constructor(initrdSrc = '/initrd.img', initrdDest = '/home/eggs/mnt/ovarium/iso/live/initrd.img', fsLive = '/home/eggs/ovarium/filesystem') {
-        this.initrdSrc = initrdSrc;
-        this.initrdDest = initrdDest;
-        this.fsLive = fsLive;
-        console.log('sorgente: ' + this.initrdSrc);
-        console.log('destinazione: ' + this.initrdDest);
-        console.log('fsLive: ' + this.fsLive);
-    }
-    /**
-     * Check initrd for cryptroot, resume, cryptsetup.
-     */
-    check() {
-        const initrd = {};
-        const cmdCheck = `lsinitramfs ${this.initrdSrc} | egrep 'conf/conf.d/cryptroot|cryptroot/crypttab|conf/conf.d/resume|conf/conf.d/zz-resume-auto'`;
-        const check = shx.exec(cmdCheck, { silent: true });
-        if (check.includes('conf/conf.d/cryptroot')) {
-            initrd.cryptoroot = true;
-        }
-        if (check.includes('cryptroot/crypttab')) {
-            initrd.crypttab = true;
-        }
-        if (check.includes('conf/conf.d/resume')) {
-            initrd.resume = true;
-        }
-        if (check.includes('conf/conf.d/zz-resume-auto')) {
-            initrd.zz_resume_auto = true;
-        }
-        return initrd;
-    }
-    /**
-     * clean
-     */
-    clean() {
-        this.extract();
-        this.edit();
-        this.rebuild();
-    }
-    /**
-     * extract
-     */
-    async extract(initrd = '/initrd.img', verbose = false) {
-        let echo = { echo: false, ignore: false };
-        if (verbose) {
-            echo = { echo: true, ignore: false };
-        }
-        const savedState = process.cwd();
-        // cancello e ricreo la cartella di lavore
-        if (fs.existsSync(this.workDir)) {
-            shx.exec(`rm ${this.workDir} -rf`);
-        }
-        shx.mkdir(this.workDir);
-        process.chdir(this.workDir);
-        // Verifico il tipo di compressione
-        const cmd = `file -L ${this.initrdSrc} | egrep -o 'gzip compressed|XZ compressed|cpio archive'`;
-        const compressionShell = shx.exec(cmd).trimStart().trimEnd();
-        switch (compressionShell) {
-            case 'gzip compressed': {
-                break;
-            }
-            case 'xz compressed': {
-                this.compression = 'xz';
-                break;
-            }
-            case 'cpio compressed': {
-                this.compression = 'cpio';
-                break;
-            }
-            // No default
-        }
-        // Estratto initrd nella cartella di lavoro
-        console.log('compression: [' + this.compression + ']');
-        if ((this.compression = 'gzip')) {
-            shx.exec(`zcat ${initrd} | cpio -i`);
-        }
-        else if (this.compression === 'xz') {
-            shx.exec(`xzcat ${initrd} | cpio -d -i -m`);
-        }
-        else if (this.compression === 'cpio') {
-            shx.exec(`(cpio -i ; zcat | cpio -i) < ${initrd}`);
-        }
-        process.chdir(savedState);
-    }
-    /**
-     * edit
-     */
-    edit(verbose = true) {
-        // Analizzo per cryptroot
-        if (fs.existsSync(`${this.workDir}/conf/conf.d/cryptroot`)) {
-            console.log('Removing cryptroot');
-            shx.exec(`rm -f ${this.workDir}/conf/conf.d/cryptroot`);
-        }
-        else if (fs.existsSync(`${this.workDir}/cryptroot/crypttab`)) {
-            console.log('Removing crypttab');
-            shx.exec(`rm -f ${this.workDir}/cryptroot/crypttab`);
-        }
-        // Analizzo per resume
-        if (fs.existsSync(`${this.workDir}/conf/conf.d/resume`)) {
-            console.log('Removing resume');
-            shx.exec(`rm -f ${this.workDir}/conf/conf.d/resume`);
-            shx.exec(`rm -f ${this.fsLive}/etc/initramfs-tools/conf.d/resume`);
-        }
-        else if (`${this.workDir}/conf/conf.d/zz-resume-auto`) {
-            shx.exec(`rm -f ${this.workDir}/rm -f conf/conf.d/zz-resume-auto`);
-            shx.exec(`rm -f ${this.fsLive}/etc/initramfs-tools/conf.d/resume`);
-        }
-    }
-    /**
-     * rebuild
-     */
-    rebuild(initrd = '/initrd.img', verbose = true) {
-        let echo = { echo: false, ignore: false };
-        if (verbose) {
-            echo = { echo: true, ignore: false };
-        }
-        const savedState = process.cwd();
-        console.log('Compression: ' + this.compression);
-        process.chdir(this.workDir);
-        console.log('work_dir: ' + this.workDir);
-        if (this.compression === 'gzip') {
-            shx.exec(`find . -print0 | cpio -0 -H newc -o | gzip -c > ${this.initrdDest}`);
-        }
-        else if (this.compression === 'xz') {
-            shx.exec(`find . | cpio -o -H newc | xz --check=crc32 --x86 --lzma2=dict=512KiB > ${this.initrdDest}`);
-        }
-        process.chdir(savedState);
-    }
-}