penguins-eggs 10.0.49 → 10.0.52

package/dist/classes/pacman.js

@@ -12,12 +12,14 @@ import path from 'node:path';
 import shx from 'shelljs';
 import { exec } from '../lib/utils.js';
 import Distro from './distro.js';
-import Alpine from './families/alpine.js';
-import Archlinux from './families/archlinux.js';
-import Debian from './families/debian.js';
-import Fedora from './families/fedora.js';
-import Opensuse from './families/opensuse.js';
-import Voidlinux from './families/voidlinux.js';
+import Aldos from './pacman.d/aldos.js';
+import Alpine from './pacman.d/alpine.js';
+import Archlinux from './pacman.d/archlinux.js';
+import Debian from './pacman.d/debian.js';
+import Fedora from './pacman.d/fedora.js';
+import Openmamba from './pacman.d/openmamba.js';
+import Opensuse from './pacman.d/opensuse.js';
+import Voidlinux from './pacman.d/voidlinux.js';
 import Settings from './settings.js';
 import Utils from './utils.js';
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
@@ -56,33 +58,34 @@ export default class Pacman {
      */
     static async calamaresInstall(verbose = false) {
         if (this.isInstalledGui()) {
-            if (this.distro().familyId === 'debian') {
-                await Debian.calamaresInstall(verbose);
+            const familyId = this.distro().familyId;
+            if (familyId === 'aldos') {
+                await Aldos.calamaresInstall(verbose);
             }
-            else if (this.distro().familyId === 'fedora') {
-                await Fedora.calamaresInstall(verbose);
+            else if (familyId === 'alpine') {
+                await Alpine.calamaresInstall(verbose);
             }
-            else if (this.distro().familyId === 'archlinux') {
+            else if (familyId === 'archlinux') {
                 if (this.distro().distroId === 'ManjaroLinux' || this.distro().distroId === 'BigLinux') {
-                    const cmd = `pacman -Sy --noconfirm calamares`;
-                    try {
-                        await exec(cmd, Utils.setEcho(true));
-                    }
-                    catch {
-                        Utils.error(`manjaro: ${cmd}`); // + e.error)
-                    }
+                    await exec(`pacman -Sy --noconfirm calamares`, Utils.setEcho(true));
                 }
                 else {
                     await Archlinux.calamaresInstall(verbose);
                 }
             }
-            else if (this.distro().familyId === 'alpine') {
-                await Alpine.calamaresInstall(verbose);
+            else if (familyId === 'debian') {
+                await Debian.calamaresInstall(verbose);
             }
-            else if (this.distro().familyId === 'opensuse') {
+            else if (familyId === 'fedora') {
+                await Fedora.calamaresInstall(verbose);
+            }
+            else if (familyId === 'openmamba') {
+                await Openmamba.calamaresInstall(verbose);
+            }
+            else if (familyId === 'opensuse') {
                 await Opensuse.calamaresInstall(verbose);
             }
-            else if (this.distro().familyId === 'voidlinux') {
+            else if (familyId === 'voidlinux') {
                 await Voidlinux.calamaresInstall(verbose);
             }
             // remove others calamares links
@@ -104,22 +107,29 @@ export default class Pacman {
      */
     static async calamaresRemove(verbose = true) {
         let retVal = false;
-        if (this.distro().familyId === 'debian') {
-            retVal = await Debian.calamaresRemove(verbose);
+        const familyId = this.distro().familyId;
+        if (familyId === 'aldos') {
+            retVal = await Aldos.calamaresRemove(verbose);
         }
-        else if (this.distro().familyId === 'fedora') {
-            retVal = await Fedora.calamaresRemove(verbose);
+        else if (familyId === 'alpine') {
+            retVal = await Alpine.calamaresRemove(verbose);
         }
-        else if (this.distro().familyId === 'archlinux') {
+        else if (familyId === 'archlinux') {
             retVal = await Archlinux.calamaresRemove(verbose);
         }
-        else if (this.distro().familyId === 'alpine') {
-            retVal = await Alpine.calamaresRemove(verbose);
+        else if (familyId === 'debian') {
+            retVal = await Debian.calamaresRemove(verbose);
         }
-        else if (this.distro().familyId === 'opensuse') {
+        else if (familyId === 'fedora') {
+            retVal = await Fedora.calamaresRemove(verbose);
+        }
+        else if (familyId === 'openmamba') {
+            retVal = await Openmamba.calamaresRemove(verbose);
+        }
+        else if (familyId === 'opensuse') {
             retVal = await Opensuse.calamaresRemove(verbose);
         }
-        else if (this.distro().familyId === 'voidlinux') {
+        else if (familyId === 'voidlinux') {
             retVal = await Voidlinux.calamaresRemove(verbose);
         }
         return retVal;
@@ -165,12 +175,6 @@ export default class Pacman {
         config.compression = 'xz';
         config.ssh_pass = false;
         config.timezone = 'Europe/Rome';
-        // config.locales_default = '__NOT_USED_MORE'
-        // config.locales = ['__NOT_USED_MORE']
-        // config.timezone = 'America/New_York'
-        // const env = process.env
-        // config.locales_default = env.LANG !== undefined ? env.LANG : 'en_US.UTF-8'
-        // config.locales = config.locales_default === 'en_US.UTF-8' ? ['en_US.UTF-8'] : [config.locales_default, 'en_US.UTF-8']
         config.pmount_fixed = false;
         if (!this.calamaresExists()) {
             config.force_installer = false;
@@ -272,6 +276,7 @@ export default class Pacman {
      */
     static distroTemplateCheck() {
         const { codenameLikeId } = this.distro();
+        // console.log(codenameLikeId)
         return fs.existsSync(`/etc/penguins-eggs.d/distros/${codenameLikeId}`);
     }
     /**
@@ -291,42 +296,74 @@ export default class Pacman {
         /**
          * Debian 8 jessie:  eredita grub, isolinux e locales da buster, contiene krill al posto di calamares
          */
-        if (this.distro().codenameLikeId === 'jessie') {
+        const codenameLikeId = this.distro().codenameLikeId;
+        /***********************************************************************************
+        * aldos
+        **********************************************************************************/
+        if (codenameLikeId === 'aldos') {
+            const dest = '/etc/penguins-eggs.d/distros/aldos/';
+            const aldos = `${rootPen}/conf/distros/aldos/*`;
+            await exec(`cp -r ${aldos} ${dest}`, echo);
+            /***********************************************************************************
+             * Alpine
+             **********************************************************************************/
+        }
+        else if (codenameLikeId === 'alpine') {
+            // eredita solo da alpine
+            const dest = '/etc/penguins-eggs.d/distros/alpine/';
+            const alpine = `${rootPen}/conf/distros/alpine/`;
+            await exec(`cp -r ${alpine}/calamares ${dest}/calamares`, echo);
+            /***********************************************************************************
+             * Arch Linux
+             **********************************************************************************/
+        }
+        else if (codenameLikeId === 'rolling') {
+            const dest = '/etc/penguins-eggs.d/distros/rolling/';
+            const rolling = `${rootPen}/conf/distros/rolling/*`;
+            await exec(`cp -r ${rolling} ${dest}`, echo);
+            /***********************************************************************************
+             * Debian
+             **********************************************************************************/
+            /**
+             * Debian 8 jessie
+             */
+        }
+        else if (codenameLikeId === 'jessie') {
             const dest = '/etc/penguins-eggs.d/distros/jessie';
-            await exec(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/krill`, echo);
+            await exec(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/calamares`, echo);
             /**
              * Debian 9 stretch:  eredita grub, isolinux e locales da buster, contiene krill al posto di calamares
              */
         }
-        else if (this.distro().codenameLikeId === 'stretch') {
+        else if (codenameLikeId === 'stretch') {
             const dest = '/etc/penguins-eggs.d/distros/stretch';
-            await exec(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/krill`, echo);
+            await exec(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/calamares`, echo);
             /**
              * Debian 10 buster: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'buster') {
+        else if (codenameLikeId === 'buster') {
             const dest = '/etc/penguins-eggs.d/distros/buster';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Debian 11 bullseye: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'bullseye') {
+        else if (codenameLikeId === 'bullseye') {
             const dest = '/etc/penguins-eggs.d/distros/bullseye';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Debian 12 bookworm: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'bookworm') {
+        else if (codenameLikeId === 'bookworm') {
             const dest = '/etc/penguins-eggs.d/distros/bookworm';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Debian 13 trixie: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'trixie') {
+        else if (codenameLikeId === 'trixie') {
             const dest = '/etc/penguins-eggs.d/distros/trixie';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /***********************************************************************************
@@ -336,30 +373,55 @@ export default class Pacman {
              * Devuan beowulf: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'beowulf') {
+        else if (codenameLikeId === 'beowulf') {
             const dest = '/etc/penguins-eggs.d/distros/beowulf';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Devuan chimaera: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'chimaera') {
+        else if (codenameLikeId === 'chimaera') {
             const dest = '/etc/penguins-eggs.d/distros/chimaera';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Devuan daedalus: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'daedalus') {
+        else if (codenameLikeId === 'daedalus') {
             const dest = '/etc/penguins-eggs.d/distros/daedalus';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Devuan excalibur: eredita tutto da buster
              */
         }
-        else if (this.distro().codenameLikeId === 'excalibur') {
+        else if (codenameLikeId === 'excalibur') {
             const dest = '/etc/penguins-eggs.d/distros/excalibur';
             await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
+            /***********************************************************************************
+             * Fedora
+             **********************************************************************************/
+        }
+        else if (codenameLikeId === 'fedora') {
+            const dest = '/etc/penguins-eggs.d/distros/fedora/';
+            const fedora = `${rootPen}/conf/distros/fedora/*`;
+            await exec(`cp -r ${fedora} ${dest}`, echo);
+            /***********************************************************************************
+            * openmamba
+            **********************************************************************************/
+        }
+        else if (codenameLikeId === 'openmamba') {
+            // eredita solo da openmamba
+            const dest = '/etc/penguins-eggs.d/distros/openmamba/';
+            const mamba = `${rootPen}/conf/distros/openmamba/*`;
+            await exec(`cp -r ${mamba} ${dest}`, echo);
+            /***********************************************************************************
+            * opensuse
+            **********************************************************************************/
+        }
+        else if (codenameLikeId === 'opensuse') {
+            const dest = '/etc/penguins-eggs.d/distros/opensuse/';
+            const suse = `${rootPen}/conf/distros/opensuse/*`;
+            await exec(`cp -r ${suse} ${dest}`, echo);
             /***********************************************************************************
              * Ubuntu
              **********************************************************************************/
@@ -367,52 +429,31 @@ export default class Pacman {
              * Ubuntu 10.04 bionic: eredita da bionic, focal grub ed isolinux, da buster i seguenti
              */
         }
-        else if (this.distro().codenameLikeId === 'bionic') {
+        else if (codenameLikeId === 'bionic') {
             const dest = '/etc/penguins-eggs.d/distros/bionic';
             const bionic = `${rootPen}/conf/distros/bionic`;
             await exec(`cp -r ${bionic}/* ${dest}`, echo);
-            // Poi da buster
-            await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
+            await partialFromBuster(dest, echo);
             /**
              * Ubuntu focal: eredita da noble e buster
              */
         }
-        else if (this.distro().codenameLikeId === 'focal') {
+        else if (codenameLikeId === 'focal') {
             const dest = '/etc/penguins-eggs.d/distros/focal';
             const noble = `${rootPen}/conf/distros/noble`;
             await exec(`cp -r ${noble}/* ${dest}`, echo);
-            //  backport per focal e jammy: fstab, mount, users
             await exec(`cp ${noble}/calamares/modules/focal-jammy/* ${dest}/calamares/modules/`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
+            await partialFromBuster(dest, echo);
             /**
              * Ubuntu 22.04 jammy: eredita da noble e buster
              */
         }
-        else if (this.distro().codenameLikeId === 'jammy') {
+        else if (codenameLikeId === 'jammy') {
             const dest = '/etc/penguins-eggs.d/distros/jammy';
             const noble = `${rootPen}/conf/distros/noble`;
             await exec(`cp -r ${noble}/* ${dest}`, echo);
-            //  backport per focal e jammy: fstab, mount, users
             await exec(`cp ${noble}/calamares/modules/focal-jammy/* ${dest}/calamares/modules/`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
+            await partialFromBuster(dest, echo);
             /**
              * Ubuntu noble: e la nuova baseline per ubuntu
              *
@@ -422,70 +463,22 @@ export default class Pacman {
             const dest = '/etc/penguins-eggs.d/distros/noble';
             const noble = `${rootPen}/conf/distros/noble`;
             await exec(`cp -r ${noble}/* ${dest}`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
+            await partialFromBuster(dest, echo);
             /**
              * Ubuntu rhino: eredita da noble e buster
              *
              */
         }
-        else if (this.distro().codenameLikeId === 'devel') {
+        else if (codenameLikeId === 'devel') {
             const dest = '/etc/penguins-eggs.d/distros/devel';
             const noble = `${rootPen}/conf/distros/noble`;
             await exec(`cp -r ${noble}/* ${dest}`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await exec(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
-            /***********************************************************************************
-             * Fedora
-             **********************************************************************************/
-        }
-        else if (this.distro().codenameLikeId === 'fedora') {
-            const dest = '/etc/penguins-eggs.d/distros/fedora/';
-            const fedora = `${rootPen}/conf/distros/fedora/*`;
-            await exec(`cp -r ${fedora} ${dest}`, echo);
-            /***********************************************************************************
-             * Arch Linux
-             **********************************************************************************/
-            /**
-             * Endeavour rolling: eredita da rolling
-             */
-        }
-        else if (this.distro().codenameLikeId === 'rolling') {
-            const dest = '/etc/penguins-eggs.d/distros/rolling/';
-            const rolling = `${rootPen}/conf/distros/rolling/*`;
-            await exec(`cp -r ${rolling} ${dest}`, echo);
-            /***********************************************************************************
-             * Alpine
-             **********************************************************************************/
-        }
-        else if (this.distro().codenameLikeId === 'alpine') {
-            // eredita solo da alpine
-            const dest = '/etc/penguins-eggs.d/distros/alpine/';
-            const alpine = `${rootPen}/conf/distros/alpine/`;
-            await exec(`cp -r ${alpine}/calamares ${dest}/calamares`, echo);
-            /***********************************************************************************
-            * opensuse
-            **********************************************************************************/
-        }
-        else if (this.distro().codenameLikeId === 'opensuse') {
-            const dest = '/etc/penguins-eggs.d/distros/opensuse/';
-            const suse = `${rootPen}/conf/distros/opensuse/*`;
-            await exec(`cp -r ${suse} ${dest}`, echo);
+            await partialFromBuster(dest, echo);
             /***********************************************************************************
             * voidlinux
             **********************************************************************************/
         }
-        else if (this.distro().codenameLikeId === 'voidlinux') {
+        else if (codenameLikeId === 'voidlinux') {
             const dest = '/etc/penguins-eggs.d/distros/voidlinux/';
             const voidLinux = `${rootPen}/conf/distros/voidlinux/*`;
             await exec(`cp -r ${voidLinux} ${dest}`, echo);
@@ -515,32 +508,43 @@ export default class Pacman {
      */
     static isInstalledWayland() {
         let installed = false;
-        if (this.distro().familyId === 'debian') {
-            if (Debian.packageIsInstalled('xwayland')) {
+        const familyId = this.distro().familyId;
+        if (familyId === 'aldos') {
+            if (Aldos.packageIsInstalled('wayland')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'fedora') {
-            if (Fedora.packageIsInstalled('xorg-x11-server-Xwayland*')) {
+        else if (familyId === 'alpine') {
+            if (Alpine.packageIsInstalled('xwayland*')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'archlinux') {
+        else if (familyId === 'archlinux') {
             if (Archlinux.packageIsInstalled('xwayland')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'alpine') {
-            if (Alpine.packageIsInstalled('xwayland*')) {
+        else if (familyId === 'debian') {
+            if (Debian.packageIsInstalled('xwayland')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'opensuse') {
+        else if (familyId === 'fedora') {
+            if (Fedora.packageIsInstalled('xorg-x11-server-Xwayland*')) {
+                installed = true;
+            }
+        }
+        else if (familyId === 'openmamba') {
+            if (Openmamba.packageIsInstalled('wayland')) {
+                installed = true;
+            }
+        }
+        else if (familyId === 'opensuse') {
             if (Opensuse.packageIsInstalled('wayland')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'voidlinux') {
+        else if (familyId === 'voidlinux') {
             if (Voidlinux.packageIsInstalled('wayland')) {
                 installed = true;
             }
@@ -553,27 +557,38 @@ export default class Pacman {
      */
     static isInstalledXorg() {
         let installed = false;
-        if (this.distro().familyId === 'debian') {
-            if (Debian.packageIsInstalled('xserver-xorg-core')) {
+        const familyId = this.distro().familyId;
+        if (familyId === 'aldos') {
+            if (Aldos.packageIsInstalled('xorg-server')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'fedora') {
-            if (Fedora.packageIsInstalled('xorg-x11-server-Xorg.x86_64')) {
+        else if (familyId === 'alpine') {
+            if (Alpine.packageIsInstalled('xorg-server')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'archlinux') {
+        else if (familyId === 'archlinux') {
             if (Archlinux.packageIsInstalled('xorg-server-common')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'alpine') {
-            if (Alpine.packageIsInstalled('xorg-server')) {
+        else if (familyId === 'debian') {
+            if (Debian.packageIsInstalled('xserver-xorg-core')) {
                 installed = true;
             }
         }
-        else if (this.distro().familyId === 'opensuse') {
+        else if (familyId === 'fedora') {
+            if (Fedora.packageIsInstalled('xorg-x11-server-Xorg.x86_64')) {
+                installed = true;
+            }
+        }
+        else if (familyId === 'openmamba') {
+            if (Openmamba.packageIsInstalled('xorg-server')) {
+                installed = true;
+            }
+        }
+        else if (familyId === 'opensuse') {
             if (Opensuse.packageIsInstalled('xorg-x11-server')) {
                 installed = true;
             }
@@ -659,21 +674,31 @@ export default class Pacman {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (this.distro().familyId === 'debian') {
-            retVal = await Debian.packageInstall(packageName);
+        const familyId = this.distro().familyId;
+        if (familyId === 'aldos') {
+            retVal = await Aldos.packageInstall(packageName);
+        }
+        else if (familyId === 'alpine') {
+            retVal = await Alpine.packageInstall(packageName);
         }
-        else if (this.distro().familyId === 'archlinux') {
+        else if (familyId === 'archlinux') {
             retVal = await Archlinux.packageInstall(packageName);
         }
-        else if (this.distro().familyId === 'fedora') {
+        else if (familyId === 'debian') {
+            retVal = await Debian.packageInstall(packageName);
+        }
+        else if (familyId === 'fedora') {
             retVal = await Fedora.packageInstall(packageName);
         }
-        else if (this.distro().familyId === 'alpine') {
-            retVal = await Alpine.packageInstall(packageName);
+        else if (familyId === 'openmamba') {
+            retVal = await Openmamba.packageInstall(packageName);
         }
-        else if (this.distro().familyId === 'opensuse') {
+        else if (familyId === 'opensuse') {
             retVal = await Opensuse.packageInstall(packageName);
         }
+        else if (familyId === 'voidlinux') {
+            retVal = await Voidlinux.packageInstall(packageName);
+        }
         return retVal;
     }
     /**
@@ -682,56 +707,50 @@ export default class Pacman {
      */
     static packageIsInstalled(packageName) {
         let installed = false;
-        if (this.distro().familyId === 'debian') {
-            installed = Debian.packageIsInstalled(packageName);
+        const familyId = this.distro().familyId;
+        if (familyId === 'aldos') {
+            installed = Aldos.packageIsInstalled(packageName);
         }
-        else if (this.distro().familyId === 'fedora') {
-            installed = Fedora.packageIsInstalled(packageName);
+        else if (familyId === 'alpine') {
+            installed = Alpine.packageIsInstalled(packageName);
         }
-        else if (this.distro().familyId === 'archlinux') {
+        else if (familyId === 'archlinux') {
             installed = Archlinux.packageIsInstalled(packageName);
         }
-        else if (this.distro().familyId === 'alpine') {
-            installed = Alpine.packageIsInstalled(packageName);
+        else if (familyId === 'debian') {
+            installed = Debian.packageIsInstalled(packageName);
+        }
+        else if (familyId === 'fedora') {
+            installed = Fedora.packageIsInstalled(packageName);
+        }
+        else if (familyId === 'openmamba') {
+            installed = Openmamba.packageIsInstalled(packageName);
         }
-        else if (this.distro().familyId === 'opensuse') {
+        else if (familyId === 'opensuse') {
             installed = Opensuse.packageIsInstalled(packageName);
         }
+        else if (familyId === 'voidlinux') {
+            installed = Voidlinux.packageIsInstalled(packageName);
+        }
         return installed;
     }
     static async packageNpmLast(packageNpm = 'penguins-eggs') {
         return shx.exec('npm show ' + packageNpm + ' version', { silent: true }).stdout.trim();
     }
-    /**
-     *
-     * @returns grub
-     */
-    static whichGrubIsInstalled() {
-        let grubInstalled = '';
-        if (this.distro().familyId === 'debian') {
-            if (this.packageIsInstalled('grub-common')) {
-                grubInstalled = 'grub';
-            }
-        }
-        else if (this.distro().familyId === 'fedora') {
-            if (this.packageIsInstalled('grub2-common.noarch')) {
-                grubInstalled = 'grub2';
-            }
-        }
-        else if (this.distro().familyId === 'archlinux') {
-            if (this.packageIsInstalled('grub')) {
-                grubInstalled = 'grub';
-            }
-        }
-        else if (this.distro().familyId === 'alpine') {
-            grubInstalled = 'grub';
-        }
-        else if (this.distro().familyId === 'opensuse') {
-            grubInstalled = 'grub';
-        }
-        else if (this.distro().familyId === 'voidlinux') {
-            grubInstalled = 'grub';
-        }
-        return grubInstalled;
-    }
+}
+/**
+ *
+ * @param dest
+ * @param echo
+ */
+async function partialFromBuster(dest, echo) {
+    const rootPen = Utils.rootPenguin();
+    const buster = `${rootPen}/conf/distros/buster`;
+    await exec(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
+    await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
+    await exec(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
+    await exec(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
+    await exec(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
+    await exec(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
+    await exec(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
 }

package/dist/classes/tailor.js

@@ -128,6 +128,8 @@ export default class Tailor {
                 }
                 break;
             }
+            case 'AlmaLinux':
+            case 'RockyLinux':
             case 'Fedora': {
                 tailorList = `${this.costume}/fedora.yml`;
                 if (!fs.existsSync(tailorList)) {