penguins-eggs 25.10.30 → 25.11.12

package/dist/classes/keyboards.js

@@ -1,287 +1,136 @@
 /**
  * ./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 fs from 'node:fs';
 import { exec } from '../lib/utils.js';
-// XkbModel - name of the model of your keyboard type
-// XkbLayout - layout(s) you intend to use
-// XkbVariant - variant(s) of the layout you intend to use
-// XkbOptions - extra xkb configuration options
 /**
- * /usr/share/X11/xkb/rules/xorg.lst
+ * Keyboard class - reads and manages X11 keyboard configuration
  */
 export default class Keyboard {
-    layouts = [];
-    models = [];
-    options = [];
-    variants = [];
+    layouts = []; // New change #1: store typed objects instead of raw strings
+    models = []; // New change #1
+    options = []; // New change #1
+    variants = []; // New change #1
+    defaultKeyboardFile = '/etc/default/keyboard'; // New change #2: store default keyboard file path
+    xorgLstFile = '/usr/share/X11/xkb/rules/xorg.lst';
     constructor() {
-        const xorg = '/usr/share/X11/xkb/rules/xorg.lst';
-        if (fs.existsSync(xorg)) {
-            const lines = fs.readFileSync(xorg, 'utf8').split('\n');
-            const lenght = lines.length;
-            let isModel = false;
-            let isLayout = false;
-            let isVariant = false;
-            let isOption = false;
-            for (let i = 0; i < lenght; i++) {
-                if (lines[i].slice(0, 1) === '!') {
-                    switch (lines[i]) {
-                        case '! model': {
-                            isModel = true;
-                            isLayout = false;
-                            isVariant = false;
-                            isOption = false;
-                            break;
-                        }
-                        case '! layout': {
-                            isModel = false;
-                            isLayout = true;
-                            isVariant = false;
-                            isOption = false;
-                            break;
-                        }
-                        case '! variant': {
-                            isModel = false;
-                            isLayout = false;
-                            isVariant = true;
-                            isOption = false;
-                            break;
-                        }
-                        case '! option': {
-                            isModel = false;
-                            isLayout = false;
-                            isVariant = false;
-                            isOption = true;
-                            break;
-                        }
-                        // No default
-                    }
-                    i++;
-                }
-                if (isModel) {
-                    this.models.push(lines[i].trim());
-                }
-                else if (isLayout) {
-                    this.layouts.push(lines[i].trim());
-                }
-                else if (isVariant) {
-                    this.variants.push(lines[i].trim());
-                }
-                else if (isOption) {
-                    this.options.push(lines[i].trim());
-                }
-            }
+        // New change #3: Use a safer approach to read xorg.lst
+        if (fs.existsSync(this.xorgLstFile)) {
+            const content = fs.readFileSync(this.xorgLstFile, 'utf8');
+            this.parseXorgLst(content);
         }
         else {
-            this.models.push('pc105');
-            this.layouts = [
-                'af',
-                'al',
-                'am',
-                'ara',
-                'at',
-                'az',
-                'ba',
-                'bd',
-                'be',
-                'bg',
-                'br',
-                'brai',
-                'by',
-                'ca',
-                'ch',
-                'cm',
-                'cn',
-                'cz',
-                'de',
-                'dk',
-                'dz',
-                'ee',
-                'epo',
-                'fr',
-                'gb',
-                'ge',
-                'gh',
-                'gr',
-                'hr',
-                'hu',
-                'id',
-                'ie',
-                'il',
-                'in',
-                'iq',
-                'ir',
-                'is',
-                'it',
-                'jp',
-                'ke',
-                'kg',
-                'kr',
-                'kz',
-                'la',
-                'latam',
-                'lk',
-                'lt',
-                'lv',
-                'ma',
-                'md',
-                'me',
-                'mk',
-                'ml',
-                'mm',
-                'mt',
-                'my',
-                'ng',
-                'nl',
-                'no',
-                'nz',
-                'ph',
-                'pk',
-                'pl',
-                'pt',
-                'ro',
-                'rs',
-                'ru',
-                'se',
-                'si',
-                'sk',
-                'sy',
-                'th',
-                'tj',
-                'tw',
-                'ua',
-                'us',
-                'uz',
-                'vn'
-            ];
-            this.variants.push('none');
-            this.options.push('none');
+            this.setDefaults();
         }
     }
-    /**
-     * XKBLAYOUT='us'
-     */
-    async getLayout() {
-        const file = '/etc/default/keyboard';
-        const cmd = 'grep XKBLAYOUT < /etc/default/keyboard | cut -f2 -d= | cut -f2 "-d\\""';
-        let keyboardLayout = 'us';
-        if (fs.existsSync(file)) {
+    // New change #4: parse xorg.lst with regex instead of fixed slicing
+    parseXorgLst(content) {
+        const sections = ['model', 'layout', 'variant', 'option'];
+        let currentSection = null;
+        content.split('\n').forEach(line => {
+            line = line.trim();
+            if (!line)
+                return;
+            if (line.startsWith('!')) {
+                const sectionName = line.slice(2).toLowerCase();
+                if (sections.includes(sectionName)) {
+                    currentSection = sectionName;
+                }
+                else {
+                    currentSection = null;
+                }
+                return;
+            }
+            if (!currentSection)
+                return;
+            // Separate code and description with regex
+            const match = line.match(/^(\S+)\s+(.*)$/);
+            if (!match)
+                return;
+            const [_, code, description] = match;
+            const desc = description || '';
+            switch (currentSection) {
+                case 'model':
+                    this.models.push({ code, description: desc });
+                    break;
+                case 'layout':
+                    this.layouts.push({ code, description: desc });
+                    break;
+                case 'variant':
+                    // Extract language if possible
+                    const langMatch = desc.match(/^(\S+):\s*(.*)$/);
+                    this.variants.push({
+                        code,
+                        lang: langMatch ? langMatch[1] : '',
+                        description: langMatch ? langMatch[2] : desc
+                    });
+                    break;
+                case 'option':
+                    this.options.push({ code, description: desc });
+                    break;
+            }
+        });
+    }
+    // New change #5: set default keyboard data if xorg.lst not found
+    setDefaults() {
+        this.models.push({ code: 'pc105', description: 'Generic 105-key PC' });
+        const defaultLayouts = ['us', 'fr', 'de', 'gb', 'es', 'it', 'ru', 'jp']; // shortened for example
+        defaultLayouts.forEach(l => this.layouts.push({ code: l, description: '' }));
+        this.variants.push({ code: 'none', lang: '', description: 'none' });
+        this.options.push({ code: 'none', description: 'none' });
+    }
+    // New change #6: read keyboard configuration from file safely
+    async readKeyboardConfig(variable) {
+        if (!fs.existsSync(this.defaultKeyboardFile))
+            return '';
+        try {
+            const cmd = `grep ^${variable}= ${this.defaultKeyboardFile} | cut -d= -f2 | tr -d '"'`;
             const result = await exec(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
-                keyboardLayout = result.data.trim();
+                return result.data.trim();
             }
+            return '';
         }
-        return keyboardLayout;
+        catch {
+            return '';
+        }
+    }
+    // Get current layout
+    async getLayout() {
+        const layout = await this.readKeyboardConfig('XKBLAYOUT');
+        return layout || 'us';
     }
-    /**
-     * XKBLAYOUT=[]
-     */
+    // Get all layouts
     getLayouts() {
-        const oLayouts = [];
-        for (const layout of this.layouts) {
-            const l = {};
-            l.code = layout.slice(0, 15).trim();
-            l.description = layout.slice(16);
-            oLayouts.push(l);
-        }
-        return oLayouts;
+        return this.layouts;
     }
-    /**
-     * XKBMODEL='pc105'
-     */
+    // Get current model
     async getModel() {
-        const file = '/etc/default/keyboard';
-        const cmd = `grep XKBMODEL < ${file} |cut -f2 -d= | cut -f2 "-d\\""`;
-        let keyboardModel = 'pc105';
-        if (fs.existsSync(file)) {
-            const result = await exec(cmd, { capture: true, echo: false, ignore: false });
-            if (result.code === 0) {
-                keyboardModel = result.data.trim();
-            }
-        }
-        return keyboardModel;
+        const model = await this.readKeyboardConfig('XKBMODEL');
+        return model || 'pc105';
     }
-    /**
-     * XKBMODEL[]
-     */
+    // Get all models
     getModels() {
-        // 0123456789012345678901234567890123456789
-        // pc101           Generic 101-key PC
-        const oModels = [];
-        for (const model of this.models) {
-            const m = {};
-            m.code = model.slice(0, 15).trim();
-            m.description = model.slice(16);
-            oModels.push(m);
-        }
-        return oModels;
+        return this.models;
     }
-    /**
-     * XKBOPTIONS=''
-     */
+    // Get current option
     async getOption() {
-        const file = '/etc/default/keyboard';
-        const cmd = `grep XKBOPTIONS < ${file} | cut -f2 -d= | cut -f2 "-d\\""`;
-        let keyboardOption = '';
-        if (fs.existsSync(file)) {
-            const result = await exec(cmd, { capture: true, echo: false, ignore: false });
-            if (result.code === 0) {
-                keyboardOption = result.data.trim();
-            }
-        }
-        return keyboardOption;
+        return await this.readKeyboardConfig('XKBOPTIONS');
     }
-    /**
-     * XKBOPTIONS[]
-     */
+    // Get all options
     getOptions() {
-        // 0123456789012345678901234567890123456789
-        // grp:switch           Right Alt (while pressed)
-        const aoOptions = [];
-        for (const option of this.options) {
-            const o = {};
-            o.code = option.slice(0, 15).trim();
-            o.description = option.slice(21);
-            aoOptions.push(o);
-        }
-        return aoOptions;
+        return this.options;
     }
-    /**
-     * XKBVARIANT=''
-     */
+    // Get current variant
     async getVariant() {
-        const file = '/etc/default/keyboard';
-        const cmd = `grep XKBVARIANT < ${file} | cut -f2 -d=|cut -f2 "-d\\""`;
-        let keyboardVariant = '';
-        if (fs.existsSync(file)) {
-            const result = await exec(cmd, { capture: true, echo: false, ignore: false });
-            if (result.code === 0) {
-                keyboardVariant = result.data.trim();
-            }
-        }
-        return keyboardVariant;
+        return await this.readKeyboardConfig('XKBVARIANT');
     }
-    /**
-     * IXkbVariant[]
-     */
+    // Get variants for a specific layout
     getVariants(layout) {
-        // 0123456789012345678901234567890123456789
-        // chr             us: Cherokee
-        const aoVariants = [];
-        for (const variant of this.variants) {
-            const v = {};
-            v.code = variant.slice(0, 15).trim();
-            v.lang = variant.substring(16, variant.indexOf(':')).trim();
-            v.description = variant.slice(Math.max(0, variant.indexOf(':')));
-            if (v.lang === layout) {
-                aoVariants.push(v);
-            }
-        }
-        return aoVariants;
+        return this.variants.filter(v => v.lang === layout);
     }
 }

package/dist/classes/ovary.d/initrd.js

@@ -73,7 +73,6 @@ export async function initrdDebian(verbose = false) {
     const prefix = this.settings.config.snapshot_prefix;
     const destFinal = `${this.settings.iso_work}live/${path.basename(this.initrd)}`;
     const log = `> ${this.settings.iso_work}${prefix}mkinitramfs.log.txt 2>&1`;
-    const target = path.join(this.dotMnt, 'filesystem.squashfs');
     const cmd = `mkinitramfs -v -o ${destFinal} ${this.kernel} ${log}`;
     await exec(cmd, this.echo);
 }
@@ -83,14 +82,10 @@ export async function initrdDebian(verbose = false) {
 export async function initrdDracut() {
     Utils.warning(`creating ${path.basename(this.initrd)} using dracut on (ISO)/live`);
     const prefix = this.settings.config.snapshot_prefix;
+    const destFinal = `${this.settings.iso_work}live/${path.basename(this.initrd)}`;
     const log = `> ${this.settings.iso_work}${prefix}dracut.log.txt 2>&1`;
     const confdir = '--confdir ' + path.resolve(__dirname, `../../../dracut/dracut.conf.d`);
     const kmoddir = `--kmoddir /lib/modules/${this.kernel}`;
-    const initramfs = `${this.settings.iso_work}live/${path.basename(this.initrd)}`;
-    const cmd = `dracut --force ${confdir} ${kmoddir} ${initramfs} ${this.kernel} ${log}`;
-    console.log(cmd);
+    const cmd = `dracut --force -v ${confdir} ${kmoddir} ${destFinal} ${this.kernel} ${log}`;
     await exec(cmd, this.echo);
-    // clean per btrfs
-    let clean = `../../../scripts/99clean ${this.kernel}`;
-    await exec(clean, this.echo);
 }

package/dist/classes/pacman.d/archlinux.js

@@ -14,19 +14,19 @@ import Utils from '../utils.js';
  * @remarks all the utilities
  */
 export default class Archlinux {
-    static packs4calamares = ['calamares-eggs']; // , 'calamares']
+    static packs4calamares = ['calamares']; // , 'calamares']
     /**
      * Archlinux: calamaresInstall
      */
     static async calamaresInstall(verbose = false) {
         verbose = true; // serve per pacman
         const echo = Utils.setEcho(verbose);
-        let cmd = `pacman -S calamares-eggs --noconfirm`;
+        let cmd = `pacman -S calamares --noconfirm`;
         try {
             await exec(cmd, echo);
         }
         catch {
-            Utils.error(`Cannot install calamares-eggs`);
+            Utils.error(`Cannot install calamares`);
         }
     }
     /**
@@ -44,11 +44,11 @@ export default class Archlinux {
         let success = false;
         const echo = Utils.setEcho(verbose);
         try {
-            await exec('pacman -R calamares calamares-eggs --noconfirm', echo);
+            await exec('pacman -R calamares calamares --noconfirm', echo);
             success = true;
         }
         catch {
-            Utils.error(`Cannot remove calamares-eggs`);
+            Utils.error(`Cannot remove calamares`);
         }
         if (success && fs.existsSync('/etc/calamares')) {
             await exec('rm /etc/calamares -rf', echo);

package/dist/classes/pacman.d/debian.js

@@ -34,8 +34,6 @@ export default class Debian {
             Utils.error(`Debian.calamaresInstall() apt-get install --yes ${array2spaced(this.debs4calamares)}`); // + e.error)
         }
         // remove others calamares links
-        await exec('rm -f /usr/share/applications/calamares-eggs-debugging.desktop');
-        await exec('rm -f /usr/share/applications/calamares-eggs.desktop');
         await exec('rm -f /usr/share/applications/calamares.desktop');
     }
     /**

package/dist/classes/pacman.d/opensuse.js

@@ -42,11 +42,11 @@ export default class Opensuse {
         let success = false;
         const echo = Utils.setEcho(verbose);
         try {
-            await exec('zypper remove -y calamares calamares-eggs', echo);
+            await exec('zypper remove -y calamares calamares', echo);
             success = true;
         }
         catch {
-            Utils.error(`Cannot remove calamares-eggs`);
+            Utils.error(`Cannot remove calamares`);
         }
         if (success && fs.existsSync('/etc/calamares')) {
             await exec('rm /etc/calamares -rf', echo);

package/dist/classes/pacman.js

@@ -417,23 +417,21 @@ export default class Pacman {
              * Ubuntu
              **********************************************************************************/
             /**
-             * Ubuntu focal: eredita da focal e buster
+             * Ubuntu focal: eredita da noble
              */
         }
         else if (distroUniqueId === 'focal') {
             const dest = '/etc/penguins-eggs.d/distros/focal';
-            const focal = `${rootPen}/conf/distros/focal`;
-            await exec(`cp -r ${focal}/* ${dest}`, echo);
-            await exec(`cp ${focal}/calamares/modules/focal-jammy/* ${dest}/calamares/modules/`, echo);
+            const noble = `${rootPen}/conf/distros/noble`;
+            await exec(`cp -r ${noble}/* ${dest}`, echo);
             /**
-             * Ubuntu 22.04 jammy: eredita da focal e buster
+             * Ubuntu 22.04 jammy: eredita da noble
              */
         }
         else if (distroUniqueId === 'jammy') {
             const dest = '/etc/penguins-eggs.d/distros/jammy';
-            const focal = `${rootPen}/conf/distros/focal`;
-            await exec(`cp -r ${focal}/* ${dest}`, echo);
-            await exec(`cp ${focal}/calamares/modules/focal-jammy/* ${dest}/calamares/modules/`, echo);
+            const noble = `${rootPen}/conf/distros/noble`;
+            await exec(`cp -r ${noble}/* ${dest}`, echo);
             /**
              * Ubuntu noble: e la nuova baseline per ubuntu
              *
@@ -444,7 +442,7 @@ export default class Pacman {
             const noble = `${rootPen}/conf/distros/noble`;
             await exec(`cp -r ${noble}/* ${dest}`, echo);
             /**
-             * Ubuntu rhino: eredita da noble e buster
+             * Ubuntu rhino: devel
              *
              */
         }