penguins-eggs 10.0.38 → 10.0.41

package/dist/classes/distro.js

@@ -24,12 +24,8 @@ class Distro {
     familyId;
     homeUrl;
     isCalamaresAvailable;
-    isolinuxPath;
     liveMediumPath;
-    memdiskPath;
-    pxelinuxPath;
     releaseId;
-    releaseLike;
     squashfs;
     supportUrl;
     syslinuxPath;
@@ -39,6 +35,7 @@ class Distro {
      */
     constructor() {
         let found = false;
+        // Tutti i default sono per Debian
         this.bugReportUrl = 'https://github.com-pieroproietti/penguins-eggs/issue';
         this.codenameId = '';
         this.codenameLikeId = '';
@@ -47,36 +44,12 @@ class Distro {
         this.familyId = 'debian';
         this.homeUrl = 'https://penguins-eggs.net';
         this.isCalamaresAvailable = true;
-        this.isolinuxPath = '';
         this.liveMediumPath = '/run/live/medium/';
-        this.memdiskPath = '';
-        this.pxelinuxPath = '';
         this.releaseId = '';
-        this.releaseLike = '';
         this.squashfs = 'live/filesystem.squashfs';
         this.supportUrl = 'https://penguins-eggs.net';
-        this.syslinuxPath = '';
+        this.syslinuxPath = path.resolve(__dirname, `../../syslinux`);
         this.usrLibPath = '/usr/lib';
-        const os_release = '/etc/os-release';
-        if (fs.existsSync(os_release)) {
-            let lines = [];
-            if (fs.existsSync(os_release)) {
-                const data = fs.readFileSync(os_release, 'utf8');
-                lines = data.split('\n');
-            }
-            // per ogni riga
-            for (const line of lines) {
-                if (line.startsWith('HOME_URL=')) {
-                    this.homeUrl = line.slice('HOME_URL='.length).replaceAll('"', '');
-                }
-                else if (line.startsWith('SUPPORT_URL=')) {
-                    this.supportUrl = line.slice('SUPPORT_URL='.length).replaceAll('"', '');
-                }
-                else if (line.startsWith('BUG_REPORT_URL=')) {
-                    this.bugReportUrl = line.slice('BUG_REPORT_URL='.length).replaceAll('"', '');
-                }
-            }
-        }
         /**
          * lsb_release -cs per codename (version)
          * lsb_release -is per distribuzione
@@ -85,25 +58,17 @@ class Distro {
         this.codenameId = shell.exec('lsb_release -cs', { silent: true }).stdout.toString().trim();
         this.releaseId = shell.exec('lsb_release -rs', { silent: true }).stdout.toString().trim();
         this.distroId = shell.exec('lsb_release -is', { silent: true }).stdout.toString().trim();
-        /**
-         * releaseLike = releaseId
-         */
-        this.releaseLike = this.releaseId;
-        /**
-         * Per casi equivoci conviene normalizzare codenameId
-         *  -i, --id           show distributor ID
-         *  -r, --release      show release number of this distribution
-         *  -c, --codename     show code name of this distribution
-         */
-        if (this.distroId === 'Debian' && this.releaseId === 'unstable' && this.codenameId === 'sid') {
+        if (this.distroId === 'Debian' && this.codenameId === 'sid') {
             this.codenameId = 'trixie';
         }
-        else if (this.distroId === 'Debian' && this.releaseId === 'testing/unstable') {
-            this.codenameId = 'trixie';
-            this.releaseLike = 'unstable';
+        if (this.distroId.includes('BigLinux')) {
+            this.distroId = "BigLinux";
         }
         /**
-         * Analize distroId
+         * Per Alpine, Fedora ed OpenSUSE basta distroId,
+         * Debian, Devuan, Ubuntu e derivate ricadono in
+         * default e si analizza il codebaseId
+         *
          */
         switch (this.distroId) {
             /**
@@ -111,6 +76,10 @@ class Distro {
              */
             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;
             }
             /**
@@ -119,6 +88,10 @@ class Distro {
             case 'NobaraLinux':
             case 'Fedora': {
                 this.familyId = 'fedora';
+                this.distroLike = this.distroId;
+                this.codenameId = 'rolling'; // viene rimosso dal nome
+                this.codenameLikeId = this.familyId; // per krill
+                this.liveMediumPath = '/run/initramfs/live/';
                 break;
             }
             /**
@@ -126,12 +99,31 @@ class Distro {
              */
             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;
+            }
+            /**
+             * 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;
             }
             /**
-             * Arch/Debian/Devuan/Manjaro and Ubuntu
+             * Arch/Debian/Devuan and Ubuntu
+             * analizzo i codebase conosciuti
              */
             default: {
+                /**
+                 * Debian
+                 */
                 switch (this.codenameId) {
                     case 'jessie': {
                         this.distroLike = 'Debian';
@@ -186,7 +178,7 @@ class Distro {
                         break;
                     }
                     /**
-                     * Ubuntu LTS + actual
+                     * Ubuntu
                      */
                     case 'bionic': {
                         this.distroLike = 'Ubuntu';
@@ -209,9 +201,7 @@ class Distro {
                         this.codenameLikeId = 'noble';
                         break;
                     }
-                    /**
-                     * Rhino
-                     */
+                    // rhino
                     case 'devel': {
                         this.distroLike = 'Ubuntu';
                         this.codenameLikeId = 'devel';
@@ -231,7 +221,7 @@ class Distro {
                         break;
                     }
                     /**
-                     * find in derivatives
+                     * derivatives
                      */
                     default: {
                         /**
@@ -255,107 +245,58 @@ class Distro {
                                 }
                             }
                         }
+                        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;
-                    }
-                } // Fine analisi codenameId
             }
         } // Fine analisi distroId
         /**
-         * if lsb-release exists
+         * Ultimi ritocchi
          */
-        const lsbConfig = '/etc/lsb-release';
-        if (fs.existsSync(lsbConfig)) {
-            this.distroId = Utils.searchOnFile(lsbConfig, `DISTRIB_ID`);
-            this.codenameId = Utils.searchOnFile(lsbConfig, `DISTRIB_CODENAME`);
-            // patch for BigLinux
-            if (this.distroId.toLowerCase().includes('biglinux')) {
-                this.distroId = 'biglinux';
-            }
+        /**
+         * Debian: /usr/lib/x86_64-linux-gnu
+         *         /usr/lib/aarch64-linux-gnu
+         */
+        if (this.familyId === "Debian") {
+            this.usrLibPath = '/usr/lib/' + Utils.usrLibPath();
         }
         /**
-         * ManjaroLinux and BigLinux
+         * ManjaroLinux e derivate
          */
-        if (this.distroId === 'ManjaroLinux' || this.distroId.toLowerCase().includes('biglinux')) {
+        if (this.distroId === 'ManjaroLinux' || this.distroId === 'BigLinux') {
             this.liveMediumPath = '/run/miso/bootmnt/';
             this.squashfs = 'manjaro/x86_64/livefs.sfs';
         }
         /**
-         * all the distros without codename: Alpine, fedora, opensuse
+         * lottura os_release per i pulsanti
          */
-        switch (this.familyId) {
-            case '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.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;
-                found = true;
-                break;
-            }
-            case 'fedora': {
-                this.distroLike = 'Fedora';
-                this.codenameId = 'rolling'; // questo viene rimosso dal nome
-                this.codenameLikeId = 'fedora';
-                this.liveMediumPath = '/run/initramfs/live/';
-                this.syslinuxPath = '/usr/share/syslinux/';
-                this.pxelinuxPath = this.syslinuxPath;
-                this.usrLibPath = '/usr/lib/';
-                this.memdiskPath = this.syslinuxPath;
-                this.isolinuxPath = this.syslinuxPath;
-                this.isCalamaresAvailable = true;
-                found = true;
-                break;
+        const os_release = '/etc/os-release';
+        if (fs.existsSync(os_release)) {
+            let lines = [];
+            if (fs.existsSync(os_release)) {
+                const data = fs.readFileSync(os_release, 'utf8');
+                lines = data.split('\n');
             }
-            case 'opensuse':
-                {
-                    this.distroLike = 'openSUSE';
-                    this.codenameId = 'rolling';
-                    this.codenameLikeId = 'opensuse';
-                    this.liveMediumPath = '/run/initramfs/live/'; // è il mount della root su cd di installatione
-                    this.syslinuxPath = '/usr/share/syslinux/';
-                    this.pxelinuxPath = this.syslinuxPath;
-                    this.usrLibPath = '/usr/lib/';
-                    this.memdiskPath = this.syslinuxPath;
-                    this.isolinuxPath = this.syslinuxPath;
-                    this.isCalamaresAvailable = true;
-                    found = true;
-                    break;
+            // per ogni riga
+            for (const line of lines) {
+                if (line.startsWith('HOME_URL=')) {
+                    this.homeUrl = line.slice('HOME_URL='.length).replaceAll('"', '');
+                }
+                else if (line.startsWith('SUPPORT_URL=')) {
+                    this.supportUrl = line.slice('SUPPORT_URL='.length).replaceAll('"', '');
                 }
-                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);
+                else if (line.startsWith('BUG_REPORT_URL=')) {
+                    this.bugReportUrl = line.slice('BUG_REPORT_URL='.length).replaceAll('"', '');
                 }
+            }
         }
     }
 }

package/dist/classes/families/fedora.js

@@ -21,7 +21,7 @@ export default class Fedora {
     static async calamaresInstall(verbose = true) {
         const echo = Utils.setEcho(verbose);
         try {
-            await exec(`dnf install ${this.packs4calamares.join(' ')}`, echo);
+            await exec(`dnf install -y ${this.packs4calamares.join(' ')}`, echo);
         }
         catch {
             Utils.error(`fedora.calamaresInstall()`);

package/dist/classes/families/voidlinux.d.ts

@@ -0,0 +1,48 @@
+/**
+ * ./src/classes/families/voidlinux.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+/**
+ * Utils: general porpourse utils
+ * @remarks all the utilities
+ */
+export default class Voidlinux {
+    static packs4calamares: string[];
+    /**
+     *
+     */
+    static calamaresInstall(verbose?: boolean): Promise<void>;
+    /**
+     *
+     */
+    static calamaresRemove(verbose?: boolean): Promise<boolean>;
+    /**
+     * check if it's installed wayland
+     * @returns true if wayland
+     */
+    static isInstalledWayland(): boolean;
+    /**
+     * check if it's installed xorg
+     * @returns true if xorg is installed
+     */
+    static isInstalledXorg(): boolean;
+    /**
+     * restuisce VERO se il pacchetto è installato
+     * @param packageName
+     */
+    static packageAvailable(packageName: string): Promise<boolean>;
+    /**
+     * Install the package packageName
+     * @param packageName {string} Pacchetto da installare
+     * @returns {boolean} True if success
+     */
+    static packageInstall(packageName: string): Promise<boolean>;
+    /**
+     * restuisce VERO se il pacchetto è installato
+     * @param packageName
+     */
+    static packageIsInstalled(packageName: string): boolean;
+}

package/dist/classes/families/voidlinux.js

@@ -0,0 +1,84 @@
+/**
+ * ./src/classes/families/voidlinux.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import shx from 'shelljs';
+/**
+ * Utils: general porpourse utils
+ * @remarks all the utilities
+ */
+export default class Voidlinux {
+    static packs4calamares = [''];
+    /**
+     *
+     */
+    static async calamaresInstall(verbose = true) {
+        if (verbose) {
+            console.log("calamares non disponibile on VoidLinux");
+        }
+    }
+    /**
+     *
+     */
+    static async calamaresRemove(verbose = true) {
+        if (verbose) {
+            console.log("calamares non disponibile on VoidLinux");
+        }
+        return true;
+    }
+    /**
+     * check if it's installed wayland
+     * @returns true if wayland
+     */
+    static isInstalledWayland() {
+        return this.packageIsInstalled('wayland');
+    }
+    /**
+     * check if it's installed xorg
+     * @returns true if xorg is installed
+     */
+    static isInstalledXorg() {
+        return this.packageIsInstalled('xorg-server');
+    }
+    /**
+     * restuisce VERO se il pacchetto è installato
+     * @param packageName
+     */
+    static async packageAvailable(packageName) {
+        let available = false;
+        const cmd = `/usr/bin/xbps-query -Rs ${packageName} | grep Package:`;
+        const stdout = shx.exec(cmd, { silent: true }).stdout.trim();
+        if (stdout.includes(packageName)) {
+            available = true;
+        }
+        return available;
+    }
+    /**
+     * Install the package packageName
+     * @param packageName {string} Pacchetto da installare
+     * @returns {boolean} True if success
+     */
+    static async packageInstall(packageName) {
+        let retVal = false;
+        if (shx.exec(`/usr/bin/xbps-install ${packageName}`, { silent: true }) === '0') {
+            retVal = true;
+        }
+        return retVal;
+    }
+    /**
+     * restuisce VERO se il pacchetto è installato
+     * @param packageName
+     */
+    static packageIsInstalled(packageName) {
+        let installed = false;
+        const cmd = `/usr/bin/xbps-query -l | grep ${packageName}`;
+        const stdout = shx.exec(cmd, { silent: true }).stdout.trim();
+        if (stdout.includes(packageName)) {
+            installed = true;
+        }
+        return installed;
+    }
+}

package/dist/classes/ovary.d.ts

@@ -83,30 +83,23 @@ export default class Ovary {
      */
     finished(scriptOnly?: boolean): void;
     /**
-     * initrdAlpine()
+     * mkinitfs()
      */
     initrdAlpine(): Promise<void>;
     /**
-     * initrdArch()
-     * necessita di echoYes
+     * mkinitcpio()
      */
     initrdArch(): Promise<void>;
     /**
-     * initrdDebian()
-     * Actually based on live* packages
-     * We must upgrade to initrdCreate for Debian/Ubuntu
+     * mkinitramfs() Debian
      */
     initrdDebian(verbose?: boolean): Promise<void>;
     /**
-     * initrdFedora()
+     * dracut() Fedora/Opensuse/Voidlinux
      */
-    initrdFedora(): Promise<void>;
+    initrdDracut(): Promise<void>;
     /**
-     * initrdSuse()
-     */
-    initrdSuse(): Promise<void>;
-    /**
-     * syslinux: new version
+     * syslinux: da syspath
      */
     syslinux(theme?: string): Promise<void>;
     /**