penguins-eggs 25.10.30 → 25.11.12

package/dist/classes/diversions.js

@@ -1,131 +1,100 @@
 /**
  * ./src/classes/diversions.ts
  * penguins-eggs v.25.7.x / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
+ * author: Piero Proietti (modified by Hossein Seilani)
  * license: MIT
+ *
+ * NEW VERSION: Improved and cleaned with detailed comments and new changes
  */
 import Distro from './distro.js';
 export default class Diversions {
-    /**
-     *
-     * @param familyId
-     * @returns
-     */
+    // NEW CHANGE [1]
+    // Made isSystemDBoot more readable by using direct return without extra variable.
+    // Simplified logic for clarity.
     static isSystemDBoot(familyId, isEfi) {
-        let isSystemDBoot = false;
-        if (familyId === 'fedora' && isEfi) {
-            isSystemDBoot = true;
-        }
-        return isSystemDBoot;
+        return familyId === 'fedora' && isEfi;
     }
-    /**
-     *
-     * @param familyId
-     * @returns deluser
-     */
+    // NEW CHANGE [2]
+    // Simplified deluser function using array.includes and default value.
+    // This makes adding new families easier and avoids long OR chains.
     static deluser(familyId) {
-        let deluser = 'deluser';
-        if (familyId === 'aldos' ||
-            familyId === 'archlinux' ||
-            familyId === 'fedora' ||
-            familyId === 'openmamba' ||
-            familyId === 'opensuse' ||
-            familyId === 'voidlinux') {
-            deluser = 'userdel';
-        }
-        return deluser;
+        const userdelFamilies = ['aldos', 'archlinux', 'fedora', 'openmamba', 'opensuse', 'voidlinux'];
+        return userdelFamilies.includes(familyId) ? 'userdel' : 'deluser';
     }
-    /**
-     *
-     * @param familyId
-     * @returns
-     */
+    // NEW CHANGE [3]
+    // Improved grubName using array.includes and direct return
+    // Cleaner, easier to maintain if new families are added
     static grubName(familyId) {
-        let grubName = 'grub';
-        if (familyId === 'aldos' ||
-            familyId === 'fedora' ||
-            familyId === 'opensuse') {
-            grubName = 'grub2';
-        }
-        return grubName;
+        const grub2Families = ['aldos', 'fedora', 'opensuse'];
+        return grub2Families.includes(familyId) ? 'grub2' : 'grub';
     }
-    /**
-     * grubForce
-     */
+    // NEW CHANGE [4]
+    // Simplified grubForce function with array.includes
+    // Provides explicit "--force" only for specific families
     static grubForce(familyId) {
-        let grubForce = '';
-        if (familyId === 'aldos' || familyId === 'fedora') {
-            grubForce = '--force';
-        }
-        return grubForce;
+        const forceFamilies = ['aldos', 'fedora'];
+        return forceFamilies.includes(familyId) ? '--force' : '';
     }
-    /**
-     *
-     * @param familyId
-     * @param volid
-     * @returns
-     */
+    // NEW CHANGE [5]
+    // Improved kernelParameters function:
+    // - Use template literals consistently
+    // - Reduce redundant code
+    // - Added optional `fullCrypt` handling for debian
     static kernelParameters(familyId, volid, fullCrypt = false) {
-        // GRUB_CMDLINE_LINUX='ipv6.disable=1'
-        let kp = "";
-        if (familyId === 'alpine') {
-            kp += `alpinelivelabel=${volid} alpinelivesquashfs=/mnt/live/filesystem.squashfs`;
-        }
-        else if (familyId === 'archlinux') {
-            kp += `boot=live components locales=${process.env.LANG}`;
-            const distroId = this.distro().distroId;
-            if (this.isManjaroBased(distroId)) {
-                kp += ` misobasedir=manjaro misolabel=${volid}`;
-            }
-            else {
-                kp += ` archisobasedir=arch archisolabel=${volid}`;
-            }
-        }
-        else if (familyId === 'debian') {
-            kp += `boot=live components locales=${process.env.LANG} cow_spacesize=2G`;
-            if (fullCrypt) {
-                kp += ` live-media=/run/live/medium`;
+        let kp = '';
+        switch (familyId) {
+            case 'alpine':
+                kp += `alpinelivelabel=${volid} alpinelivesquashfs=/mnt/live/filesystem.squashfs`;
+                break;
+            case 'archlinux': {
+                const distroId = this.distro().distroId;
+                kp += `boot=live components locales=${process.env.LANG}`;
+                if (this.isManjaroBased(distroId)) {
+                    kp += ` misobasedir=manjaro misolabel=${volid}`;
+                }
+                else {
+                    kp += ` archisobasedir=arch archisolabel=${volid}`;
+                }
+                break;
             }
-        }
-        else if (familyId === 'fedora') {
-            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs selinux=0`;
-        }
-        else if (familyId === 'openmamba') {
-            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs selinux=0`;
-        }
-        else if (familyId === 'opensuse') {
-            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs apparmor=0`;
-        }
-        else if (familyId === 'voidlinux') {
-            kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs rd.debug`;
+            case 'debian':
+                kp += `boot=live components locales=${process.env.LANG} cow_spacesize=2G`;
+                if (fullCrypt)
+                    kp += ` live-media=/run/live/medium`;
+                break;
+            case 'fedora':
+            case 'openmamba':
+                kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs selinux=0`;
+                break;
+            case 'opensuse':
+                kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs apparmor=0`;
+                break;
+            case 'voidlinux':
+                kp += `root=live:CDLABEL=${volid} rd.live.image rd.live.dir=/live rd.live.squashimg=filesystem.squashfs rd.debug`;
+                break;
+            default:
+                kp += '';
+                break;
         }
         return kp;
     }
-    /**
-       *
-       * @returns
-       */
+    // NEW CHANGE [6]
+    // Centralized creation of Distro instance
+    // Ensures only one point of modification for Distro
     static distro() {
         return new Distro();
     }
-    /**
-    * isManjaroBased
-    */
+    // NEW CHANGE [7]
+    // Simplified isManjaroBased function using array.includes
+    // Makes it easier to maintain and extend to new derivatives
     static isManjaroBased(distro) {
-        let found = false;
-        if (distro === 'Manjaro' ||
-            distro === `Biglinux` ||
-            distro === `Bigcommunity`) {
-            found = true;
-        }
-        return found;
+        const manjaroFamilies = ['Manjaro', 'Biglinux', 'Bigcommunity'];
+        return manjaroFamilies.includes(distro);
     }
+    // NEW CHANGE [8]
+    // bootloaders path handling improved
+    // Default path for debian, custom path for all other families
     static bootloaders(familyId) {
-        let bootloaders = '/usr/lib/';
-        if (familyId !== 'debian') {
-            bootloaders = '/usr/lib/penguins-eggs/bootloaders/';
-        }
-        return bootloaders;
+        return familyId === 'debian' ? '/usr/lib/' : '/usr/lib/penguins-eggs/bootloaders/';
     }
 }

package/dist/classes/incubation/customize/customize-partitions.js

@@ -24,7 +24,8 @@ export async function customizePartitions() {
      */
     partition.availableFileSystemTypes = ['ext4'];
     if (Pacman.packageIsInstalled('progs') ||
-        Pacman.packageIsInstalled('btrfsprogs')) {
+        Pacman.packageIsInstalled('btrfsprogs') ||
+        Pacman.packageIsInstalled('btrfs-progs')) {
         partition.availableFileSystemTypes.push('btrfs');
     }
     if (Pacman.packageIsInstalled('xfsprogs')) {
@@ -33,5 +34,11 @@ export async function customizePartitions() {
     if (Pacman.packageIsInstalled('f2fs-tools')) {
         partition.availableFileSystemTypes.push('f2fs');
     }
+    // Cannot work here
+    // if (!fs.existsSync('/sys/firmware/efi')) {
+    //   if (partition.efi) {
+    //     delete partition.efi
+    //   }
+    // }
     fs.writeFileSync(filePartition, yaml.dump(partition), 'utf-8');
 }

package/dist/classes/incubation/fisherman-helper/packages.js

@@ -12,7 +12,7 @@ import Pacman from '../../pacman.js';
  * @returns yaml-string
  */
 export function remove(distro) {
-    const packages = ['calamares-eggs', 'calamares'];
+    const packages = ['calamares'];
     if (distro.familyId === 'archlinux') {
         packages.push('penguins-eggs');
     }

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

@@ -35,6 +35,11 @@ export default class Fisherman {
      * @param name
      */
     shellprocess(name: string): Promise<void>;
+    /**
+     *
+     * @param name
+     */
+    helper(name: string): Promise<void>;
     /**
      *
      * @param module

package/dist/classes/incubation/fisherman.js

@@ -145,12 +145,32 @@ export default class Fisherman {
         if (fs.existsSync(moduleSource)) {
             if (this.verbose)
                 this.show(name, 'shellprocess', moduleDest);
-            shx.cp(moduleSource, moduleDest);
+            let fileContent = fs.readFileSync(moduleSource, 'utf-8');
+            fileContent = fileContent.replace(/__LIVE_MEDIUM_PATH__/g, this.distro.liveMediumPath);
+            fs.writeFileSync(moduleDest, fileContent, 'utf-8');
         }
         else if (this.verbose) {
             console.log(`calamares: ${name} shellprocess, nothing to do`);
         }
     }
+    /**
+     *
+     * @param name
+     */
+    async helper(name) {
+        const helperSource = path.resolve(__dirname, this.installer.template + 'libexec/' + name + '.sh');
+        const helperDest = '/usr/libexec/calamares/' + name + '.sh';
+        if (fs.existsSync(helperSource)) {
+            if (this.verbose)
+                this.show(name, 'helper', helperDest);
+            let fileContent = fs.readFileSync(helperSource, 'utf-8');
+            fileContent = fileContent.replace(/__LIVE_MEDIUM_PATH__/g, this.distro.liveMediumPath);
+            fs.writeFileSync(helperDest, fileContent, { encoding: 'utf-8', mode: 0o755 });
+        }
+        else if (this.verbose) {
+            console.log(`calamares: ${name} helper, nothing to do`);
+        }
+    }
     /**
      *
      * @param module

package/dist/classes/incubation/incubator.d/noble.js

@@ -84,8 +84,12 @@ export class Noble {
         // libexec recreate
         await exec(`rm -rf /usr/libexec/calamares`);
         await exec(`mkdir -p /usr/libexec/calamares`);
-        const scriptSrc = path.resolve(__dirname, '../../../../conf/distros/noble/calamares/libexec/');
-        await exec(`cp ${scriptSrc}/*.sh /usr/libexec/calamares/`);
+        // const scriptSrc=path.resolve(__dirname, '../../../../conf/distros/noble/calamares/libexec/')
+        // await exec (`cp ${scriptSrc}/*.sh /usr/libexec/calamares/`)
+        await fisherman.helper('calamares-aptsources');
+        await fisherman.helper('calamares-l10n-helper');
+        await fisherman.helper('calamares-logs-helper'); // Sostituzione __LIVE_MEDIUM_PATH__
+        await fisherman.helper('calamares-nomodeset');
         /**
          * cfs: custom final steps
          */

package/dist/classes/incubation/incubator.js

@@ -23,13 +23,12 @@ import { customizePartitions } from './customize/customize-partitions.js';
 import { Alpine } from './incubator.d/alpine.js';
 import { Archlinux } from './incubator.d/archlinux.js';
 import { Buster } from './incubator.d/buster.js';
-import { Trixie } from './incubator.d/trixie.js';
 import { Fedora } from './incubator.d/fedora.js';
-import { Focal } from './incubator.d/focal.js';
+import { Manjaro } from './incubator.d/manjaro.js';
 import { Noble } from './incubator.d/noble.js';
 import { Openmamba } from './incubator.d/openmamba.js';
 import { Opensuse } from './incubator.d/opensuse.js';
-import { Manjaro } from './incubator.d/manjaro.js';
+import { Trixie } from './incubator.d/trixie.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 /**
@@ -161,11 +160,11 @@ export default class Incubator {
                  */
             }
             else if (distroUniqueId === 'focal') {
-                const focal = new Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
+                const focal = new Noble(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
                 await focal.create();
             }
             else if (distroUniqueId === 'jammy') {
-                const jammy = new Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
+                const jammy = new Noble(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
                 await jammy.create();
             }
             else if (distroUniqueId === 'noble') {

package/dist/classes/keyboards.d.ts

@@ -1,50 +1,31 @@
 /**
  * ./src/classes/keyboards.ts
  * penguins-eggs v.25.7.x / ecmascript 2020
- * author: Piero Proietti
+ * author: Piero Proietti (modified)
  * email: piero.proietti@gmail.com
  * license: MIT
  */
 import { IXkbLayout, IXkbModel, IXkbOption, IXkbVariant } from '../interfaces/i-xkb-model.js';
 /**
- * /usr/share/X11/xkb/rules/xorg.lst
+ * Keyboard class - reads and manages X11 keyboard configuration
  */
 export default class Keyboard {
-    layouts: string[];
-    models: string[];
-    options: string[];
-    variants: string[];
+    layouts: IXkbLayout[];
+    models: IXkbModel[];
+    options: IXkbOption[];
+    variants: IXkbVariant[];
+    private defaultKeyboardFile;
+    private xorgLstFile;
     constructor();
-    /**
-     * XKBLAYOUT='us'
-     */
+    private parseXorgLst;
+    private setDefaults;
+    private readKeyboardConfig;
     getLayout(): Promise<string>;
-    /**
-     * XKBLAYOUT=[]
-     */
     getLayouts(): IXkbLayout[];
-    /**
-     * XKBMODEL='pc105'
-     */
     getModel(): Promise<string>;
-    /**
-     * XKBMODEL[]
-     */
     getModels(): IXkbModel[];
-    /**
-     * XKBOPTIONS=''
-     */
     getOption(): Promise<string>;
-    /**
-     * XKBOPTIONS[]
-     */
     getOptions(): IXkbOption[];
-    /**
-     * XKBVARIANT=''
-     */
     getVariant(): Promise<string>;
-    /**
-     * IXkbVariant[]
-     */
     getVariants(layout: string): IXkbVariant[];
 }