penguins-eggs 25.9.8 → 25.9.14

package/dist/classes/ovary.d/live-create-structure.js

@@ -5,8 +5,6 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-// packages
-import fs from 'node:fs';
 import path from 'path';
 // interfaces
 // libraries
@@ -22,53 +20,40 @@ export async function liveCreateStructure() {
     if (this.verbose) {
         console.log('Ovary: liveCreateStructure');
     }
-    Utils.warning(`creating egg in ${this.settings.config.snapshot_dir}`);
-    let cmd;
-    if (!fs.existsSync(this.settings.config.snapshot_dir)) {
-        cmd = `mkdir -p ${this.settings.config.snapshot_dir}`;
-        tryCatch(cmd, this.verbose);
-    }
-    if (!fs.existsSync(this.settings.config.snapshot_dir + '/README.md')) {
-        cmd = `cp ${path.resolve(__dirname, '../../../conf/README.md')} ${this.settings.config.snapshot_dir}README.md`;
-        tryCatch(cmd, this.verbose);
-    }
-    // Ovarium
-    if (!fs.existsSync(this.settings.work_dir.ovarium)) {
-        cmd = `mkdir -p ${this.settings.work_dir.ovarium}`;
-        tryCatch(cmd, this.verbose);
-    }
-    if (!fs.existsSync(this.settings.work_dir.lowerdir)) {
-        cmd = `mkdir -p ${this.settings.work_dir.lowerdir}`;
-        tryCatch(cmd, this.verbose);
-    }
-    if (!fs.existsSync(this.settings.work_dir.upperdir)) {
-        cmd = `mkdir -p ${this.settings.work_dir.upperdir}`;
-        tryCatch(cmd, this.verbose);
-    }
-    if (!fs.existsSync(this.settings.work_dir.workdir)) {
-        cmd = `mkdir -p ${this.settings.work_dir.workdir}`;
-        tryCatch(cmd, this.verbose);
-    }
-    if (!fs.existsSync(this.settings.work_dir.merged)) {
-        cmd = `mkdir -p ${this.settings.work_dir.merged}`;
-        tryCatch(cmd, this.verbose);
-    }
-    /**
-     * Creo le directory di destinazione per boot, efi, isolinux e live
-     */
-    if (!fs.existsSync(this.settings.iso_work)) {
-        cmd = `mkdir -p ${this.settings.iso_work}boot/grub/${Utils.uefiFormat()}`;
-        tryCatch(cmd, this.verbose);
-        cmd = `mkdir -p ${this.settings.iso_work}isolinux`;
-        tryCatch(cmd, this.verbose);
-        cmd = `mkdir -p ${this.settings.iso_work}live`;
-        tryCatch(cmd, this.verbose);
-    }
-    // ln iso
-    cmd = `ln -s ${this.settings.iso_work} ${this.settings.config.snapshot_dir}/iso`;
-    tryCatch(cmd, this.verbose);
-    // ln livefs
-    cmd = `ln -s ${this.settings.work_dir.merged} ${this.settings.config.snapshot_dir}/livefs`;
+    Utils.warning(`creating egg in ${this.nest}`);
+    let cmd = '';
+    cmd = `# create nest\n`;
+    cmd += `mkdir -p ${this.nest}\n`;
+    cmd += `# README.md\n`;
+    cmd += `cp ${path.resolve(__dirname, '../../../conf/README.md')} ${this.nest}README.md\n`;
+    cmd += `# cleaning dotMnt\n`;
+    cmd += `rm -rf ${this.dotMnt}efi\n`;
+    cmd += `rm -rf ${this.dotMnt}filesystem.squashfs\n`;
+    cmd += `rm -rf ${this.dotMnt}/iso\n`;
+    cmd += `mkdir -p ${this.dotMnt}/iso/live\n`;
+    cmd += `mkdir -p ${this.dotMnt}/iso/boot/grub/${Utils.uefiFormat()}\n`;
+    cmd += `mkdir -p ${this.dotMnt}/iso/isolinux\n`;
+    cmd += `# cleaning (nest).overlay\n`;
+    cmd += `umount ${this.dotLivefs}/* > /dev/null 2>&1\n`;
+    cmd += `umount ${this.dotOverlay.lowerdir}/* > /dev/null 2>&1\n`;
+    cmd += `umount ${this.dotOverlay.upperdir}/* > /dev/null 2>&1\n`;
+    cmd += `umount ${this.dotOverlay.workdir}/* > /dev/null 2>&1\n`;
+    cmd += `rm -rf ${this.nest}.overlay\n`;
+    cmd += `mkdir -p ${this.dotOverlay.lowerdir}\n`;
+    cmd += `mkdir -p ${this.dotOverlay.upperdir}\n`;
+    cmd += `mkdir -p ${this.dotOverlay.workdir}\n`;
+    cmd += `sleep 1\n`;
+    cmd += `# cleaning dotLivefs\n`;
+    cmd += `rm -rf ${this.dotLivefs}\n`;
+    cmd += `mkdir -p ${this.dotLivefs}\n`;
+    cmd += `# cleaning (nest)/ovarium\n`;
+    cmd += `rm -rf ${this.nest}ovarium\n`;
+    cmd += `mkdir -p ${this.nest}ovarium\n`;
+    cmd += `# cleaning (nest)/links\n`;
+    cmd += `rm -f ${this.nest}iso\n`;
+    cmd += `ln -s ${this.nest}.mnt/iso ${this.nest}/iso\n`;
+    cmd += `rm -f ${this.nest}livefs\n`;
+    cmd += `ln -s ${this.dotLivefs} ${this.nest}livefs\n`;
     tryCatch(cmd, this.verbose);
 }
 /**
@@ -78,9 +63,7 @@ export async function liveCreateStructure() {
 async function tryCatch(cmd = '', verbose = false) {
     try {
         let echo = Utils.setEcho(verbose);
-        if (verbose) {
-            console.log(cmd);
-        }
+        // console.log(cmd)
         await exec(cmd, echo);
     }
     catch (error) {

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

@@ -47,6 +47,10 @@ export async function produce(kernel = '', clone = false, cryptedclone = false,
     this.cryptedclone = cryptedclone;
     const luksName = 'luks-volume';
     const luksFile = `/tmp/${luksName}`;
+    this.nest = this.settings.config.snapshot_dir;
+    this.dotMnt = `${this.nest}.mnt`;
+    this.dotOverlay = this.settings.work_dir;
+    this.dotLivefs = this.settings.work_dir.merged;
     /**
      * define kernel
      */

package/dist/classes/ovary.d.ts

@@ -5,6 +5,7 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+import { IWorkDir } from '../interfaces/index.js';
 import CliAutologin from './cli-autologin.js';
 import Incubator from './incubation/incubator.js';
 import Settings from './settings.js';
@@ -41,7 +42,6 @@ export default class Ovary {
     distroLike: string;
     genisoimage: boolean;
     incubator: Incubator;
-    nest: string;
     settings: Settings;
     snapshot_basename: string;
     snapshot_prefix: string;
@@ -53,6 +53,10 @@ export default class Ovary {
     kernel: string;
     initrd: string;
     vmlinuz: string;
+    nest: string;
+    dotMnt: string;
+    dotOverlay: IWorkDir;
+    dotLivefs: string;
     fertilization: typeof fertilization;
     produce: typeof produce;
     bindLiveFs: typeof bindLiveFs;

package/dist/classes/ovary.js

@@ -43,7 +43,6 @@ export default class Ovary {
     distroLike = '';
     genisoimage = false;
     incubator = {};
-    nest = '';
     settings = {};
     snapshot_basename = '';
     snapshot_prefix = '';
@@ -55,6 +54,10 @@ export default class Ovary {
     kernel = '';
     initrd = '';
     vmlinuz = '';
+    nest = '';
+    dotMnt = '';
+    dotOverlay = {};
+    dotLivefs = '';
     // I put all methods on ovary.d
     fertilization = fertilization;
     produce = produce;

package/dist/commands/export/pkg.js

@@ -93,7 +93,7 @@ export default class ExportPkg extends Command {
         }
         else if (familyId === "debian") {
             Utils.warning(`exporting Devuan/Debian/Ubuntu DEB packages`);
-            localPath = `/home/${this.user}/penguins-eggs/dist`;
+            localPath = `/home/${this.user}/penguins-eggs/releases`;
             remotePath = this.Tu.config.remotePathPackages + "/debs";
             let arch = Utils.uefiArch();
             if (this.all) {

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

@@ -7,8 +7,7 @@
  */
 /**
  * Debian 13 trixe, Ubuntu 24.04 noble usano il formato deb822
- *
- * esiste un comando per modernizzare le sorgenti:
+ * * esiste un comando per modernizzare le sorgenti:
  * sudo apt modernize-sources
  */
 import { Command } from '@oclif/core';

package/dist/commands/tools/ppa.js

@@ -7,8 +7,7 @@
  */
 /**
  * Debian 13 trixe, Ubuntu 24.04 noble usano il formato deb822
- *
- * esiste un comando per modernizzare le sorgenti:
+ * * esiste un comando per modernizzare le sorgenti:
  * sudo apt modernize-sources
  */
 import { Command, Flags } from '@oclif/core';
@@ -18,11 +17,9 @@ import Distro from '../../classes/distro.js';
 import Utils from '../../classes/utils.js';
 import { exec } from '../../lib/utils.js';
 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';
+const ppaKeyUrl = 'https://pieroproietti.github.io/penguins-eggs/deb/key.asc';
+const ppaKeyPath = '/usr/share/keyrings/penguins-eggs.gpg';
+const ppaSourcesPath = '/etc/apt/sources.list.d/penguins-eggs'; // Base path without extension
 /**
  *
  */
@@ -42,24 +39,34 @@ export default class Ppa extends Command {
     async run() {
         const { flags } = await this.parse(Ppa);
         Utils.titles(this.id + ' ' + this.argv);
-        let verbose = false;
-        if (flags.verbose) {
-            verbose = true;
-        }
         const { nointeractive } = flags;
         if (Utils.isRoot()) {
             const distro = new Distro();
-            /**
-             * Debian
-             */
-            if (distro.familyId === 'debian') {
+            if (distro.familyId === 'archlinux' && !Diversions.isManjaroBased(distro.distroId)) {
+                if (flags.add) {
+                    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) {
+                    Utils.warning(`Are you sure to remove Chaotic-AUR to your repositories?`);
+                    if (await Utils.customConfirm('Select yes to continue...')) {
+                        await archRemove();
+                    }
+                }
+            }
+            else if (distro.familyId === 'debian') {
+                /**
+                 * Debian
+                 */
                 if (flags.add) {
-                    Utils.warning(`Are you sure to add source ${path.basename(ppaName)} to your repositories?`);
+                    Utils.warning(`Are you sure to add source ${path.basename(ppaSourcesPath)} to your repositories?`);
                     if (nointeractive || (await Utils.customConfirm('Select yes to continue...'))) {
-                        // remove old penguins-eggs-ppa.list
-                        debianRemove();
+                        // Rimuove sempre le vecchie configurazioni per uno stato pulito
+                        await debianRemove();
                         if (await is822()) {
-                            debianAdd822();
+                            await debianAdd822();
                         }
                         else {
                             await debianAdd();
@@ -67,35 +74,18 @@ export default class Ppa extends Command {
                     }
                 }
                 else if (flags.remove) {
-                    Utils.warning(`Are you sure to remove source ${path.basename(ppaName)} to your repositories?`);
+                    Utils.warning(`Are you sure to remove source ${path.basename(ppaSourcesPath)} to your repositories?`);
                     if (nointeractive || (await Utils.customConfirm('Select yes to continue...'))) {
                         await debianRemove();
                     }
                 }
                 await exec('apt-get update');
-                /**
-                 * Arch and only Arch!  no Manjaro...
-                 */
-            }
-            else if (distro.familyId === 'archlinux' && !Diversions.isManjaroBased(distro.distroId)) {
-                if (flags.add) {
-                    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) {
-                    Utils.warning(`Are you sure to remove Chaotic-AUR to your repositories?`);
-                    if (await Utils.customConfirm('Select yes to continue...')) {
-                        await archRemove();
-                    }
-                }
                 /**
                  * Alle the others
                  */
             }
             else {
-                Utils.warning(`Distro: ${distro.distroId}/${distro.codenameId}, cannot use penguins-eggs-ppa nor chaotic-aur!`);
+                Utils.warning(`Distro: ${distro.distroId}/${distro.codenameId}, cannot use penguins-eggs-repo nor chaotic-aur!`);
             }
         }
     }
@@ -127,7 +117,6 @@ async function archRemove() {
     const path = '/var/cache/pacman/pkg/';
     const keyring = 'chaotic-keyring.pkg.tar.zst';
     const mirrorlist = 'chaotic-mirrorlist.pkg.tar.zst';
-    const echo = Utils.setEcho(true);
     if (fs.existsSync(path + keyring) && fs.existsSync(path + mirrorlist)) {
         console.log('to remove chaotic-aur:\n');
         console.log(`sudo rm ${path}${keyring}`);
@@ -139,47 +128,49 @@ async function archRemove() {
     }
 }
 /**
- * debianAdd822
+ * debianAdd822 - For modern Debian/Ubuntu with .sources files
  */
 async function debianAdd822() {
-    await exec(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${ppaKey} > /dev/null`);
+    // --- FIX: Correct GPG key URL ---
+    await exec(`curl -fsSL ${ppaKeyUrl} | gpg --dearmor -o ${ppaKeyPath}`);
     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}`);
+    content += 'URIs: https://pieroproietti.github.io/penguins-eggs/deb\n'; // Correct URI for packages
+    content += 'Suites: stable\n'; // It's better to be specific
+    content += 'Components: main\n';
+    content += `Signed-By: ${ppaKeyPath}\n`;
+    // --- IMPROVEMENT: Use the standard .sources extension ---
+    fs.writeFileSync(`${ppaSourcesPath}.sources`, content);
+    // --- IMPROVEMENT: Removed unnecessary `touch` command ---
 }
 /**
- * debianAdd
+ * debianAdd - For traditional Debian/Ubuntu with .list files
  */
 async function debianAdd() {
-    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);
+    // --- FIX: Correct GPG key URL and remove redundant sudo ---
+    await exec(`curl -fsSL ${ppaKeyUrl} | gpg --dearmor -o ${ppaKeyPath}`);
+    const content = `deb [signed-by=${ppaKeyPath}] https://pieroproietti.github.io/penguins-eggs/deb stable main\n`;
+    fs.writeFileSync(`${ppaSourcesPath}.list`, content);
 }
 /**
- * is822 (usa lo standard deb822 per le sorgenti)
+ * is822 (checks if the system uses the deb822 format)
  */
 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') {
+    const is822Result = (await exec(test, { capture: true, echo: false }));
+    if (is822Result.code === 0) {
+        if (is822Result.data.trim() === '1') {
             retval = true;
         }
     }
     return retval;
 }
 /**
- * debianRemove
+ * debianRemove - Cleans up all related PPA files
  */
 async function debianRemove() {
-    await exec(`rm -f ${ppaKey}`);
-    await exec(`rm -f ${ppaList}`);
-    await exec(`rm -f ${ppaSources}`);
+    // The script runs as root, so sudo inside exec is not needed here
+    await exec(`rm -f ${ppaKeyPath}`);
+    await exec(`rm -f ${ppaSourcesPath}*`);
 }