penguins-eggs 25.9.3 → 25.9.8

package/conf/exclude.list.d/master.list

@@ -24,6 +24,10 @@ swapfile
 sys/*
 tmp/*
 
+# fedora/el9/etc
+boot/*rescue*
+
+
 *.cache # suggestion from blaxbox-ai
 
 ######################################################################################################

package/dist/classes/utils.d/kernel.d.ts

@@ -15,10 +15,11 @@ export default class Kernel {
      */
     static vmlinuz(kernel?: string): string;
     /**
-     * Ricava path per initramfs/initrd
+     * cerca il path per initramfs/initrd nella directory /boot
+     * se fallisce, prova la convenzione Arch
      *
-     * @param kernel - Versione del kernel
-     * @returns Path al file initramfs
+     * @param kernel - Versione del kernel (es. '6.5.0-14-generic'). Se omessa, usa il kernel in esecuzione.
+     * @returns Path al file initramfs.
      */
     static initramfs(kernel?: string): string;
     /**
@@ -28,10 +29,10 @@ export default class Kernel {
      * most of the distros:
      * debian, fedora, opensuse, rasberry
      */
-    private static vmlinuxFromUname;
+    private static vmlinuzFromUname;
     /**
      * vmlinuxFromCmdline
      * raspbery /proc/cmdline dont contain it
      */
-    private static vmlinuxFromCmdline;
+    private static vmlinuzFromCmdline;
 }

package/dist/classes/utils.d/kernel.js

@@ -9,7 +9,6 @@ import path from 'path';
 import Distro from '../distro.js';
 import Utils from '../utils.js';
 import { execSync } from 'node:child_process';
-import Diversions from '../diversions.js';
 /**
  * Kernel utilities for managing vmlinuz and initramfs paths
  */
@@ -22,9 +21,9 @@ export default class Kernel {
     static vmlinuz(kernel = '') {
         let vmlinuz = '';
         if (!Utils.isContainer()) {
-            vmlinuz = this.vmlinuxFromUname();
+            vmlinuz = this.vmlinuzFromUname();
             if (vmlinuz === '') {
-                vmlinuz = this.vmlinuxFromCmdline();
+                vmlinuz = this.vmlinuzFromCmdline();
                 if (vmlinuz === '') {
                     console.log('vmlinuz not found');
                     process.exit(1);
@@ -42,57 +41,89 @@ export default class Kernel {
         return vmlinuz;
     }
     /**
-     * Ricava path per initramfs/initrd
+     * cerca il path per initramfs/initrd nella directory /boot
+     * se fallisce, prova la convenzione Arch
      *
-     * @param kernel - Versione del kernel
-     * @returns Path al file initramfs
+     * @param kernel - Versione del kernel (es. '6.5.0-14-generic'). Se omessa, usa il kernel in esecuzione.
+     * @returns Path al file initramfs.
      */
     static initramfs(kernel = '') {
-        const distro = new Distro();
-        let initramfs = '';
-        if (kernel === '') {
-            if (!Utils.isContainer()) {
-                kernel = execSync('uname -r').toString().trim();
-            }
-            else {
-                Utils.warning("cannot work on containers actually!");
+        let targetKernel = kernel;
+        // 1. Determina la versione del kernel target
+        if (targetKernel === '') {
+            if (Utils.isContainer()) {
+                Utils.warning("Non è possibile determinare il kernel in un container.");
                 process.exit(1);
             }
+            targetKernel = execSync('uname -r').toString().trim();
         }
-        // rolling...
-        if (distro.familyId === "alpine") {
-            let suffix = kernel.substring(kernel.lastIndexOf('-'));
-            initramfs = `/boot/initramfs${suffix}`;
+        const kernelVersionShort = targetKernel.split('.').slice(0, 2).join('.');
+        const bootDir = '/boot';
+        // 2. Leggi tutti i file nella directory /boot
+        let bootFiles;
+        try {
+            bootFiles = fs.readdirSync(bootDir);
         }
-        else if (distro.familyId === "archlinux" && (!Diversions.isManjaroBased(distro.distroId))) {
-            let suffix = kernel.substring(kernel.lastIndexOf('-'));
-            initramfs = `/boot/initramfs-linux${suffix}.img`;
+        catch (error) {
+            console.error(`ERRORE: Impossibile leggere la directory ${bootDir}.`);
+            process.exit(1);
         }
-        else if (distro.familyId === "archlinux" && (Diversions.isManjaroBased(distro.distroId))) {
-            let version = kernel.split('.').slice(0, 2).join('.');
-            initramfs = `/boot/initramfs-${version}-x86_64.img`;
+        // 3. Cerca il file corrispondente con un sistema di priorità
+        const candidates = [];
+        for (const filename of bootFiles) {
+            if ((filename.startsWith('initramfs-') ||
+                filename.startsWith('initrd.img-') ||
+                filename.startsWith('initrd-')) &&
+                (filename.includes(targetKernel) || filename.includes(kernelVersionShort))) {
+                candidates.push(filename);
+            }
         }
-        else {
-            // Gestione generica per le altre distro (Debian, Fedora, SUSE, OpenMamba, cc.)
-            const candidates = [
-                `/boot/initrd.img-${kernel}`, // Debian, Ubuntu
-                `/boot/initramfs-${kernel}.img`, // Fedora, RHEL
-                `/boot/initramfs-${kernel}-1mamba-x86_64.img`, // Openmamba
-                `/boot/initrd-${kernel}`, // openSUSE
-                `/boot/initramfs-${kernel}`, // fallbacks
-            ];
-            for (const candidate of candidates) {
-                if (fs.existsSync(candidate)) {
-                    initramfs = candidate;
-                    break;
+        // Se troviamo almeno un candidato, usiamo quello
+        if (candidates.length > 0) {
+            let foundPath = path.join(bootDir, candidates[0]);
+            /**
+             * ma, se sono più di uno, usiamo il più breve
+             * per evitare estensioni come -fallback.img, .old, .bak, etc
+             */
+            if (candidates.length > 1) {
+                // Filtra i candidati per escludere quelli di fallback se esiste un'alternativa
+                const nonFallbackCandidates = candidates.filter(c => !c.includes('-fallback'));
+                const searchArray = nonFallbackCandidates.length > 0 ? nonFallbackCandidates : candidates;
+                foundPath = path.join(bootDir, searchArray[0]); // Inizia con il primo
+                for (const candidate of searchArray) {
+                    const current = path.join(bootDir, candidate);
+                    if (current.length < foundPath.length) {
+                        foundPath = current;
+                    }
                 }
             }
+            return foundPath;
         }
-        if (!fs.existsSync(initramfs)) {
-            console.error(`ERROR: initramfs file ${initramfs} does not exist!`);
-            process.exit(1);
+        // 4. Fallback per casi specifici (Arch e Alpine Linux)
+        // Questo viene eseguito solo se la ricerca dinamica fallisce.
+        const staticFallbacks = [
+            // --- Alpine Linux ---
+            'initramfs-lts', // Kernel Long-Term Support
+            'initramfs-virt', // Kernel per ambienti virtualizzati
+            'initramfs-standard', // Kernel standard (meno comune)
+            'initramfs-rpi', // Kernel per Raspberry Pi
+            // --- Arch Linux ---
+            'initramfs-linux.img', // Arch Linux standard
+            'initramfs-linux-lts.img', // Arch Linux LTS
+            'initramfs-linux-zen.img', // Arch Linux Zen
+            'initramfs-linux-hardened.img', // Arch Linux hardened
+        ];
+        for (const fallback of staticFallbacks) {
+            const fallbackPath = path.join(bootDir, fallback);
+            if (fs.existsSync(fallbackPath)) {
+                // Nota: questo potrebbe non corrispondere al 100% al kernel in esecuzione,
+                // ma è il comportamento atteso su questi sistemi
+                return fallbackPath;
+            }
         }
-        return initramfs;
+        // 5. Se nessuna delle strategie ha funzionato, esci con errore
+        Utils.warning(`Could not find an initramfs file for kernel ${targetKernel} in ${bootDir}.`);
+        process.exit(1);
     }
     /**
      * ALL PRIVATE
@@ -101,7 +132,7 @@ export default class Kernel {
      * most of the distros:
      * debian, fedora, opensuse, rasberry
      */
-    static vmlinuxFromUname() {
+    static vmlinuzFromUname() {
         const kernelVersion = execSync('uname -r').toString().trim();
         let kernelPath = `/boot/vmlinuz-${kernelVersion}`;
         if (fs.existsSync(kernelPath)) {
@@ -115,7 +146,7 @@ export default class Kernel {
      * vmlinuxFromCmdline
      * raspbery /proc/cmdline dont contain it
      */
-    static vmlinuxFromCmdline() {
+    static vmlinuzFromCmdline() {
         let distro = new Distro();
         let vmlinuz = '';
         // Find vmlinuz in /proc/cmdline

package/dist/commands/export/pkg.js

@@ -60,7 +60,7 @@ export default class ExportPkg extends Command {
             if (process.arch === 'ia32') {
                 arch = 'i386';
             }
-            Utils.warning(`alpine apk`);
+            Utils.warning(`exporting Alpine APK packages`);
             localPath = `/home/${this.user}/packages/aports/${arch}`;
             remotePath = `${this.Tu.config.remotePathPackages}/alpine/${arch}`;
             filter = `penguins-eggs-*[0-9][0-9].@([0-9]|[0-1][0-9]).@([0-9]|[0-3][0-9])-*.apk`;
@@ -73,7 +73,7 @@ export default class ExportPkg extends Command {
              * Manjaro
              */
             if (Diversions.isManjaroBased(distroId)) {
-                Utils.warning("manjaro PKGBUILD");
+                Utils.warning(`exporting Manjaro .pkg.tar.zst packages`);
                 localPath = `/home/${this.user}/penguins-packs/manjaro/penguins-eggs`;
                 remotePath = this.Tu.config.remotePathPackages + "/manjaro";
                 filter = `penguins-eggs-[0-9][0-9].@([0-9]|[0-1][0-9]).@([0-9]|[0-3][0-9])-*-any.pkg.tar.*`;
@@ -82,7 +82,7 @@ export default class ExportPkg extends Command {
                  */
             }
             else {
-                Utils.warning("aur PKGBUILD");
+                Utils.warning(`exporting Arch .pkg.tar.zst packages`);
                 localPath = `/home/${this.user}/penguins-packs/aur/penguins-eggs`;
                 remotePath = this.Tu.config.remotePathPackages + "/aur";
                 filter = `penguins-eggs-[0-9][0-9].@([0-9]|[0-1][0-9]).@([0-9]|[0-3][0-9])-*-any.pkg.tar.zst`;
@@ -92,7 +92,7 @@ export default class ExportPkg extends Command {
              */
         }
         else if (familyId === "debian") {
-            Utils.warning("debian DEB");
+            Utils.warning(`exporting Devuan/Debian/Ubuntu DEB packages`);
             localPath = `/home/${this.user}/penguins-eggs/dist`;
             remotePath = this.Tu.config.remotePathPackages + "/debs";
             let arch = Utils.uefiArch();
@@ -105,22 +105,24 @@ export default class ExportPkg extends Command {
              */
         }
         else if (familyId === 'fedora') {
-            Utils.warning("fedora RPM");
-            localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
-            if (distroId === 'fedora') {
-                remotePath = this.Tu.config.remotePathPackages + "/fedora";
-                filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.fc??.x86_64.rpm`;
-            }
-            else {
-                remotePath = this.Tu.config.remotePathPackages + "/el9";
-                filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.el?.x86_64.rpm`;
+            let repo = 'fedora';
+            let ftype = 'fc??';
+            let warning = `exporting Fedora RPM packages`;
+            if (distro.distroId !== 'Fedora') {
+                repo = 'el9';
+                ftype = `el?`;
+                warning = `exporting Almalinux/Rocky RPM packages`;
             }
+            filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.${ftype}.x86_64.rpm`;
+            Utils.warning(warning);
+            localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
+            remotePath = this.Tu.config.remotePathPackages + `/` + repo;
             /**
              * openmamba
              */
         }
         else if (familyId === 'openmamba') {
-            Utils.warning("openmamba rpm packages");
+            Utils.warning(`exporting Openmamba RPM packages`);
             localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
             remotePath = this.Tu.config.remotePathPackages + "/openmamba";
             filter = `penguins-eggs-[0-9][0-9].@([0-9]|[0-1][0-9]).@([0-9]|[0-3][0-9])-*mamba.*.rpm`;
@@ -129,17 +131,10 @@ export default class ExportPkg extends Command {
              */
         }
         else if (familyId === 'opensuse') {
-            Utils.warning("opensuse rpm packages");
+            Utils.warning(`exporting OpenSuSE RPM packages`);
             localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
             remotePath = this.Tu.config.remotePathPackages + "/opensuse";
             filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.opensuse.x86_64.rpm`;
-            /**
-             * voidlinux
-             */
-        }
-        else if (familyId === 'voidlinux') {
-            Utils.warning("voidlinux packages");
-            process.exit();
         }
         let cmd = `#!/bin/bash\n`;
         cmd += `set -e\n`;
@@ -161,6 +156,7 @@ export default class ExportPkg extends Command {
         cmd += `# Export packages\n`;
         cmd += `cp ${localPath}/${filter} ${remoteMountpoint}\n`;
         cmd += 'sync\n';
+        cmd += `\n`;
         cmd += `# wait before to umount\n`;
         cmd += 'sleep 2s\n';
         cmd += `fusermount3 -u ${remoteMountpoint}\n`;
@@ -172,7 +168,6 @@ export default class ExportPkg extends Command {
             }
             console.log(`copy: ${localPath}/${filter} to ${this.Tu.config.remoteUser}@${this.Tu.config.remoteHost}:${remotePath}`);
         }
-        // console.log(cmd)
         await exec(cmd, this.echo);
     }
 }

package/dist/commands/tools/ppa.d.ts

@@ -5,6 +5,12 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+/**
+ * Debian 13 trixe, Ubuntu 24.04 noble usano il formato deb822
+ *
+ * esiste un comando per modernizzare le sorgenti:
+ * sudo apt modernize-sources
+ */
 import { Command } from '@oclif/core';
 /**
  *

package/dist/commands/tools/ppa.js

@@ -5,13 +5,24 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+/**
+ * Debian 13 trixe, Ubuntu 24.04 noble usano il formato deb822
+ *
+ * esiste un comando per modernizzare le sorgenti:
+ * sudo apt modernize-sources
+ */
 import { Command, Flags } from '@oclif/core';
 import fs from 'node:fs';
+import path from 'node:path';
 import Distro from '../../classes/distro.js';
 import Utils from '../../classes/utils.js';
 import { exec } from '../../lib/utils.js';
-const fkey = '/etc/apt/trusted.gpg.d/penguins-eggs-key.gpg';
-const flist = '/etc/apt/sources.list.d/penguins-eggs-ppa.list';
+import Diversions from '../../classes/diversions.js';
+const ppaKey = '/usr/share/keyrings/penguins-eggs-ppa.gpg';
+//             '/etc/apt/trusted.gpg.d/penguins-eggs-key.gpg'
+const ppaName = `/etc/apt/sources.list.d/penguins-eggs-ppa`;
+const ppaList = ppaName + '.list';
+const ppaSources = ppaName + '.sources';
 /**
  *
  */
@@ -43,39 +54,48 @@ export default class Ppa extends Command {
              */
             if (distro.familyId === 'debian') {
                 if (flags.add) {
-                    Utils.warning(`Are you sure to add ${flist} to your repositories?`);
+                    Utils.warning(`Are you sure to add source ${path.basename(ppaName)} to your repositories?`);
                     if (nointeractive || (await Utils.customConfirm('Select yes to continue...'))) {
-                        await debianAdd();
+                        // remove old penguins-eggs-ppa.list
+                        debianRemove();
+                        if (await is822()) {
+                            debianAdd822();
+                        }
+                        else {
+                            await debianAdd();
+                        }
                     }
                 }
                 else if (flags.remove) {
-                    Utils.warning(`Are you sure to remove ${flist} to your repositories?`);
+                    Utils.warning(`Are you sure to remove source ${path.basename(ppaName)} to your repositories?`);
                     if (nointeractive || (await Utils.customConfirm('Select yes to continue...'))) {
                         await debianRemove();
                     }
                 }
+                await exec('apt-get update');
                 /**
-                 * archlinux
+                 * Arch and only Arch!  no Manjaro...
                  */
             }
-            if (distro.familyId === 'archlinux') {
+            else if (distro.familyId === 'archlinux' && !Diversions.isManjaroBased(distro.distroId)) {
                 if (flags.add) {
-                    if (distro.distroId !== 'Manjarolinux') {
-                        Utils.warning(`Are you sure to add chaotic-aur to your repositories?`);
-                        if (await Utils.customConfirm('Select yes to continue...')) {
-                            await archAdd();
-                        }
+                    Utils.warning(`Are you sure to add Chaotic-AUR to your repositories?`);
+                    if (await Utils.customConfirm('Select yes to continue...')) {
+                        await archAdd();
                     }
                 }
                 else if (flags.remove) {
-                    await archRemove();
+                    Utils.warning(`Are you sure to remove Chaotic-AUR to your repositories?`);
+                    if (await Utils.customConfirm('Select yes to continue...')) {
+                        await archRemove();
+                    }
                 }
-            }
-            else {
                 /**
-                 * Others
+                 * Alle the others
                  */
-                Utils.warning(`Distro> ${distro.distroId}/${distro.codenameId}, cannot use this command here!`);
+            }
+            else {
+                Utils.warning(`Distro: ${distro.distroId}/${distro.codenameId}, cannot use penguins-eggs-ppa nor chaotic-aur!`);
             }
         }
     }
@@ -89,7 +109,7 @@ async function archAdd() {
     const mirrorlist = 'chaotic-mirrorlist.pkg.tar.zst';
     const echo = Utils.setEcho(true);
     if (fs.existsSync(path + keyring) && fs.existsSync(path + mirrorlist)) {
-        console.log('repository chaotic-aur, already present!');
+        console.log('repository Chaotic-AUR, already present!');
         await archRemove();
         process.exit();
     }
@@ -118,21 +138,48 @@ async function archRemove() {
         console.log(`Include = /etc/pacman.d/chaotic-mirrorlist`);
     }
 }
+/**
+ * debianAdd822
+ */
+async function debianAdd822() {
+    await exec(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${ppaKey} > /dev/null`);
+    let content = '';
+    content += 'Types: deb\n';
+    content += 'URIs: https://pieroproietti.github.io/penguins-eggs-ppa\n';
+    content += 'Suites: ./\n';
+    content += 'Signed-By: /usr/share/keyrings/penguins-eggs-ppa.gpg\n';
+    fs.writeFileSync(ppaSources, content);
+    // crea un penguins-eggs-ppa.list vuoto
+    await exec(`touch ${ppaList}`);
+}
 /**
  * debianAdd
  */
 async function debianAdd() {
-    await exec(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${fkey} > /dev/null`);
-    const content = `deb [signed-by=${fkey}] https://pieroproietti.github.io/penguins-eggs-ppa ./\n`;
-    fs.writeFileSync(flist, content);
-    await exec('apt-get update');
+    await exec(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${ppaKey} > /dev/null`);
+    const content = `deb [signed-by=${ppaKey}] https://pieroproietti.github.io/penguins-eggs-ppa ./\n`;
+    fs.writeFileSync(ppaList, content);
+}
+/**
+ * is822 (usa lo standard deb822 per le sorgenti)
+ */
+async function is822() {
+    await exec(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${ppaKey} > /dev/null`);
+    let retval = false;
+    const test = `([ -f /etc/apt/sources.list.d/ubuntu.sources ] || [ -f /etc/apt/sources.list.d/debian.sources ]) && echo "1" || echo "0"`;
+    const is822 = (await exec(test, { capture: true, echo: false, ignore: false }));
+    if (is822.code === 0) {
+        if (is822.data.trim() === '1') {
+            retval = true;
+        }
+    }
+    return retval;
 }
 /**
  * debianRemove
  */
 async function debianRemove() {
-    await exec('rm -f /etc/apt/trusted.gpg.d/penguins-eggs*');
-    await exec('rm -f /etc/apt/sources.list.d/penguins-eggs*');
-    await exec('rm -f /usr/share/keyrings/penguins-eggs*');
-    await exec('apt-get update');
+    await exec(`rm -f ${ppaKey}`);
+    await exec(`rm -f ${ppaList}`);
+    await exec(`rm -f ${ppaSources}`);
 }

package/dist/commands/update.d.ts

@@ -30,7 +30,7 @@ export default class Update extends Command {
     /**
      *
      */
-    getPkgFromRepo(): Promise<void>;
+    getPkgFromPackageManager(): Promise<void>;
     /**
      * download da LAN
      */
@@ -38,12 +38,7 @@ export default class Update extends Command {
     /**
      *
      */
-    getPkgFromSourceforge(): Promise<void>;
-    /**
-   *
-   * @param aptVersion
-   */
-    getFromSources(): void;
+    getFromSource(): void;
     /**
      * show
      */