penguins-eggs 10.0.60 → 10.1.1

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

@@ -36,16 +36,50 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
  * @param unsecure
  * @param verbose
  */
-export async function produce(clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, myLinks, excludes, nointeractive = false, noicons = false, unsecure = false, verbose = false) {
+export async function produce(kernel = '', clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, myLinks, excludes, nointeractive = false, noicons = false, unsecure = false, verbose = false) {
     this.verbose = verbose;
     this.echo = Utils.setEcho(verbose);
     if (this.verbose) {
         this.toNull = ' > /dev/null 2>&1';
     }
+    this.kernel = kernel;
     this.clone = clone;
     this.cryptedclone = cryptedclone;
     const luksName = 'luks-volume';
     const luksFile = `/tmp/${luksName}`;
+    /**
+     * define kernel
+     */
+    if (this.kernel === '') {
+        if (this.familyId === 'alpine') {
+            // to do
+        }
+        else if (this.familyId === 'archlinux') {
+            const moduleDirs = fs.readdirSync('/usr/lib/modules');
+            this.kernel = moduleDirs[0];
+            /**
+             * no need more
+             */
+            if (Diversions.isManjaroBased(this.distroId)) {
+                // this.kernel += '-MANJARO'
+            }
+        }
+        else { // debian, fedora, openmamba, opensuse, voidlinux
+            let vmlinuz = path.basename(Utils.vmlinuz());
+            this.kernel = vmlinuz.substring(vmlinuz.indexOf('-') + 1);
+        }
+    }
+    /**
+     * define this.vmlinuz
+     */
+    this.vmlinuz = Utils.vmlinuz();
+    /**
+     * define this.initrd
+     */
+    this.initrd = Utils.initrdImg(this.kernel);
+    /**
+     * yolk
+     */
     if (this.familyId === 'debian' && Utils.uefiArch() === 'amd64') {
         const yolk = new Repo();
         if (!yolk.exists()) {
@@ -69,7 +103,7 @@ export async function produce(clone = false, cryptedclone = false, scriptOnly =
     }
     else {
         await this.liveCreateStructure();
-        // Carica calamares sono se le icone sono accettate
+        // Carica calamares solo se le icone sono accettate
         if (!noicons && // se VOGLIO le icone
             !nointeractive &&
             this.settings.distro.isCalamaresAvailable &&
@@ -86,29 +120,10 @@ export async function produce(clone = false, cryptedclone = false, scriptOnly =
              * cryptedclone
              */
             console.log("eggs will SAVE users and users' data ENCRYPTED");
-            /*
-            const users = await this.usersFill()
-            for (const user of users) {
-              if (user.saveIt) {
-                let utype = 'user   '
-                if (Number.parseInt(user.uid) < 1000) {
-                  utype = 'service'
-                }
-                //console.log(`- ${utype}: ${user.login.padEnd(16)} \thome: ${user.home}`)
-                if (user.login !== 'root') {
-                  this.addRemoveExclusion(true, user.home)
-                }
-              }
-            }
-            */
         }
         else if (this.clone) {
             /**
              * clone
-             *
-             * users tend to set user_opt as
-             * real user when create a clone,
-             * this is WRONG here we correct
              */
             this.settings.config.user_opt = 'live'; // patch for humans
             this.settings.config.user_opt_passwd = 'evolution';
@@ -172,10 +187,9 @@ export async function produce(clone = false, cryptedclone = false, scriptOnly =
             this.incubator = new Incubator(this.settings.remix, this.settings.distro, this.settings.config.user_opt, this.theme, this.clone, verbose);
             await this.incubator.config(release);
             await this.syslinux(this.theme);
-            //await this.isolinux(this.theme)
             await this.kernelCopy();
             /**
-             * differents initfs for different families
+             * differents initrd for different families
              */
             if (this.familyId === 'alpine') {
                 await this.initrdAlpine();
@@ -186,8 +200,7 @@ export async function produce(clone = false, cryptedclone = false, scriptOnly =
             else if (this.familyId === 'debian') {
                 await this.initrdDebian();
             }
-            else if (this.familyId === 'aldos' ||
-                this.familyId === 'fedora' ||
+            else if (this.familyId === 'fedora' ||
                 this.familyId === 'openmamba' ||
                 this.familyId === 'opensuse' ||
                 this.familyId === 'voidlinux') {
@@ -275,13 +288,6 @@ export async function produce(clone = false, cryptedclone = false, scriptOnly =
             await exec(`mkdir ${this.settings.iso_work}${pathName}/x86_64 -p`, this.echo);
             fs.linkSync(`${this.settings.iso_work}live/filesystem.squashfs`, `${this.settings.iso_work}${pathName}.sfs`);
         }
-        /**
-         * patch per aldos
-        if (this.familyId === 'aldos') {
-          await exec(`mkdir ${this.settings.iso_work}LiveOS -p`, this.echo)
-          fs.linkSync(`${this.settings.iso_work}live/filesystem.squashfs`, `${this.settings.iso_work}LiveOS/squashfs.img`)
-        }
-        */
         await this.makeIso(mkIsofsCmd, scriptOnly);
     }
 }

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

@@ -53,14 +53,14 @@ export async function syslinux(theme = 'eggs') {
         Utils.warning('Cannot find: ' + isolinuxTemplate);
         process.exit();
     }
-    const kernel_parameters = Diversions.kernelParameters(this.familyId, this.volid); // this.kernelParameters()
+    const kernel_parameters = Diversions.kernelParameters(this.familyId, this.volid);
     const template = fs.readFileSync(isolinuxTemplate, 'utf8');
     const view = {
         fullname: this.settings.remix.fullname.toUpperCase(),
-        initrdImg: `/live${this.settings.initrdImg}`,
-        kernel: Utils.kernelVersion(),
+        initrdImg: `/live/${path.basename(this.initrd)}`,
+        kernel: this.kernel,
         kernel_parameters,
-        vmlinuz: `/live${this.settings.vmlinuz}`
+        vmlinuz: `/live/${path.basename(this.vmlinuz)}`
     };
     fs.writeFileSync(isolinuxDest, mustache.render(template, view));
     /**

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

@@ -11,6 +11,7 @@ import path from 'node:path';
 import yaml from 'js-yaml';
 // functions
 import rexec from './rexec.js';
+import Utils from '../utils.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 /**
@@ -37,6 +38,9 @@ export async function userCreateLive() {
     }
     // da problemi con il mount sshfs
     cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' chown ' + this.settings.config.user_opt + ':users' + ' /home/' + this.settings.config.user_opt + ' -R', this.verbose));
+    /**
+     *
+     */
     switch (this.familyId) {
         case 'debian': {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
@@ -70,12 +74,11 @@ export async function userCreateLive() {
         // No default
     }
     /**
-     * educaandos and others themes
-     * users.yml
+     * look to calamares/modules/users.yml for groups
      */
-    let usersConf = path.resolve(__dirname, `../../addons/${this.theme}/theme/calamares/users.yml`);
-    if (this.theme.includes('/')) {
-        usersConf = `${this.theme}/theme/calamares/modules/users.yml`;
+    let usersConf = '/etc/calamares/modules/users.conf';
+    if (!fs.existsSync(usersConf)) {
+        usersConf = '/etc/penguins-eggs.d/krill/modules/users.conf';
     }
     if (fs.existsSync(usersConf)) {
         const o = yaml.load(fs.readFileSync(usersConf, 'utf8'));
@@ -83,4 +86,8 @@ export async function userCreateLive() {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG ${group} ${this.settings.config.user_opt}`, this.verbose));
         }
     }
+    else {
+        console.log(`il file ${usersConf} non esiste!`);
+        await Utils.pressKeyToExit();
+    }
 }

package/dist/classes/ovary.d.ts

@@ -13,11 +13,11 @@ import { produce } from './ovary.d/produce.js';
 import { bindLiveFs, uBindLiveFs } from './ovary.d/bind-live-fs.js';
 import { bindVfs, ubindVfs } from './ovary.d/bind-vfs.js';
 import { editLiveFs } from './ovary.d/edit-live-fs.js';
-import { makeSquashfs, addRemoveExclusion } from './ovary.d/make-squashfs.js';
+import { makeSquashfs, addExclusion } from './ovary.d/make-squashfs.js';
 import { makeEfi } from './ovary.d/make-efi.js';
 import { xorrisoCommand } from './ovary.d/xorriso-commend.js';
 import { createXdgAutostart } from './ovary.d/create-xdg-autostart.js';
-import { merged, mergedAndOverlay } from './ovary.d/merged.js';
+import { copied, merged, mergedAndOverlay } from './ovary.d/merged.js';
 import { makeIso } from './ovary.d/make-iso.js';
 import { initrdAlpine, initrdArch, initrdDebian, initrdDracut } from './ovary.d/initrd.js';
 import { userCreateLive } from './ovary.d/user-create-live.js';
@@ -37,6 +37,7 @@ export default class Ovary {
     cryptedclone: boolean;
     echo: {};
     familyId: string;
+    distroId: string;
     genisoimage: boolean;
     incubator: Incubator;
     nest: string;
@@ -48,6 +49,9 @@ export default class Ovary {
     verbose: boolean;
     volid: string;
     uuid: string;
+    kernel: string;
+    initrd: string;
+    vmlinuz: string;
     fertilization: typeof fertilization;
     produce: typeof produce;
     bindLiveFs: typeof bindLiveFs;
@@ -55,9 +59,10 @@ export default class Ovary {
     editLiveFs: typeof editLiveFs;
     makeEfi: typeof makeEfi;
     makeSquashfs: typeof makeSquashfs;
-    addRemoveExclusion: typeof addRemoveExclusion;
+    addExclusion: typeof addExclusion;
     xorrisoCommand: typeof xorrisoCommand;
     createXdgAutostart: typeof createXdgAutostart;
+    copied: typeof copied;
     merged: typeof merged;
     mergedAndOverlay: typeof mergedAndOverlay;
     makeIso: typeof makeIso;

package/dist/classes/ovary.js

@@ -13,11 +13,11 @@ import { produce } from './ovary.d/produce.js';
 import { bindLiveFs, uBindLiveFs } from './ovary.d/bind-live-fs.js';
 import { bindVfs, ubindVfs } from './ovary.d/bind-vfs.js';
 import { editLiveFs } from './ovary.d/edit-live-fs.js';
-import { makeSquashfs, addRemoveExclusion } from './ovary.d/make-squashfs.js';
+import { makeSquashfs, addExclusion } from './ovary.d/make-squashfs.js';
 import { makeEfi } from './ovary.d/make-efi.js';
 import { xorrisoCommand } from './ovary.d/xorriso-commend.js';
 import { createXdgAutostart } from './ovary.d/create-xdg-autostart.js';
-import { merged, mergedAndOverlay } from './ovary.d/merged.js';
+import { copied, merged, mergedAndOverlay } from './ovary.d/merged.js';
 import { makeIso } from './ovary.d/make-iso.js';
 import { initrdAlpine, initrdArch, initrdDebian, initrdDracut } from './ovary.d/initrd.js';
 import { userCreateLive } from './ovary.d/user-create-live.js';
@@ -39,6 +39,7 @@ export default class Ovary {
     cryptedclone = false;
     echo = {};
     familyId = '';
+    distroId = '';
     genisoimage = false;
     incubator = {};
     nest = '';
@@ -50,6 +51,9 @@ export default class Ovary {
     verbose = false;
     volid = '';
     uuid = '';
+    kernel = '';
+    initrd = '';
+    vmlinuz = '';
     // I put all methods on ovary.d
     fertilization = fertilization;
     produce = produce;
@@ -59,9 +63,10 @@ export default class Ovary {
     editLiveFs = editLiveFs;
     makeEfi = makeEfi;
     makeSquashfs = makeSquashfs;
-    addRemoveExclusion = addRemoveExclusion;
+    addExclusion = addExclusion;
     xorrisoCommand = xorrisoCommand;
     createXdgAutostart = createXdgAutostart;
+    copied = copied;
     merged = merged;
     mergedAndOverlay = mergedAndOverlay;
     makeIso = makeIso;

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

@@ -21,11 +21,7 @@ export default class Archlinux {
     static async calamaresInstall(verbose = false) {
         verbose = true; // serve per pacman
         const echo = Utils.setEcho(verbose);
-        // const cal_eggs = 'calamares-eggs-3.3.9-1-x86_64.pkg.tar.zst' // 01/09/2024
-        // const cal_eggs = 'calamares-eggs-3.3.10-1-x86_64.pkg.tar.zst' // 24/10/2024
-        // const cal_eggs = 'calamares-eggs-3.3.12-2-x86_64.pkg.tar.zst' // 17/12/2024
-        //let cmd = `wget -O /tmp/${cal_eggs} https://sourceforge.net/projects/penguins-eggs/files/packages/aur/${cal_eggs}/download`
-        const cal_eggs = 'calamares-eggs-3.3.14-1-x86_64.pkg.tar.zst'; // 17/12/2024
+        const cal_eggs = 'calamares-eggs-3.3.14-2-x86_64.pkg.tar.zst'; // 11/05/2025
         let cmd = `wget -O /tmp/${cal_eggs} https://penguins-eggs.net/basket/packages/aur/${cal_eggs}`; // 21/12/2024
         try {
             await exec(cmd, echo);

package/dist/classes/pacman.js

@@ -193,7 +193,7 @@ export default class Pacman {
         config.make_isohybrid = true;
         config.compression = 'xz';
         config.ssh_pass = false;
-        config.timezone = 'Europe/Rome';
+        config.timezone = 'America/New_York';
         config.pmount_fixed = false;
         if (!this.calamaresExists()) {
             config.force_installer = false;
@@ -245,6 +245,7 @@ export default class Pacman {
         shx.ln('-s', path.resolve(__dirname, '../../addons'), addons);
         shx.cp(path.resolve(__dirname, '../../conf/README.md'), confRoot);
         shx.cp(path.resolve(__dirname, '../../conf/derivatives.yaml'), confRoot);
+        shx.cp(path.resolve(__dirname, '../../conf/derivatives_fedora.yaml'), confRoot);
         shx.cp(path.resolve(__dirname, '../../conf/krill.yaml'), confRoot);
         shx.cp(path.resolve(__dirname, '../../conf/love.yaml'), confRoot);
         shx.cp(path.resolve(__dirname, '../../conf/tools.yaml'), config_tools);

package/dist/classes/systemctl.d.ts

@@ -17,7 +17,7 @@ export default class SistemdCtl {
     /**
      *
      */
-    enable(service: string): Promise<void>;
+    enable(service: string, chroot?: string, report?: boolean): Promise<void>;
     /**
      *
      * @param service

package/dist/classes/systemctl.js

@@ -26,7 +26,7 @@ export default class SistemdCtl {
     /**
      *
      */
-    async enable(service) {
+    async enable(service, chroot = '/', report = false) {
         await exec(`systemctl enable ${service}`, this.echo);
     }
     /**

package/dist/classes/tailor.js

@@ -426,7 +426,8 @@ export default class Tailor {
         const distro = new Distro();
         let cmd = "";
         if (distro.familyId === "debian") {
-            cmd = `apt-cache --no-generate pkgnames`;
+            // cmd=`apt-cache --no-generate pkgnames`
+            cmd = `apt-cache pkgnames`;
         }
         else if (distro.familyId === "archlinux") {
             cmd = `pacman -S --list | awk '{print $2}'`;

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

@@ -0,0 +1,41 @@
+/**
+ * ./src/classes/utils.d/architecture.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * Architecture detection utilities - UEFI, arch-specific paths
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export default class Architecture {
+    /**
+     * Return true if i686 architecture
+     * @remarks to move in Utils
+     * @returns {boolean} true se l'architettura è i686
+     */
+    static isi686(): boolean;
+    /**
+     * uefiArch
+     * @returns arch
+     */
+    static uefiArch(): string;
+    /**
+     * i386-pc,
+     * i386-efi,
+     * x86_64-efi,
+     * arm64-efi,
+     *
+     * ATTEMZIONE: install efibootmgr
+     *
+     * Fedora/RHEL have i386-pc
+     */
+    static uefiFormat(): string;
+    /**
+     *
+     * @returns
+     */
+    static usrLibPath(): string;
+    /**
+     * get the kernel version
+     */
+    static kernelVersion(): string;
+}

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

@@ -0,0 +1,87 @@
+/**
+ * ./src/classes/utils.d/architecture.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * Architecture detection utilities - UEFI, arch-specific paths
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import shx from 'shelljs';
+import os from 'os';
+export default class Architecture {
+    /**
+     * Return true if i686 architecture
+     * @remarks to move in Utils
+     * @returns {boolean} true se l'architettura è i686
+     */
+    static isi686() {
+        return process.arch === 'ia32';
+    }
+    /**
+     * uefiArch
+     * @returns arch
+     */
+    static uefiArch() {
+        let arch = '';
+        if (process.arch === 'ia32') {
+            arch = 'i386';
+            // 
+            if (shx.exec('uname -m', { silent: true }).stdout.trim() === 'x86_64') {
+                arch = 'amd64';
+            }
+        }
+        else if (process.arch === 'x64') {
+            arch = 'amd64';
+        }
+        else if (process.arch === 'arm64') {
+            arch = 'arm64';
+        }
+        return arch;
+    }
+    /**
+     * i386-pc,
+     * i386-efi,
+     * x86_64-efi,
+     * arm64-efi,
+     *
+     * ATTEMZIONE: install efibootmgr
+     *
+     * Fedora/RHEL have i386-pc
+     */
+    static uefiFormat() {
+        let format = '';
+        if (process.arch === 'ia32') {
+            format = 'i386-efi';
+            if (shx.exec('uname -m', { silent: true }).stdout.trim() === 'x86_64') {
+                format = 'x86_64-efi';
+            }
+        }
+        else if (process.arch === 'x64') {
+            format = 'x86_64-efi';
+        }
+        else if (process.arch === 'arm64') {
+            format = 'arm64-efi';
+        }
+        return format;
+    }
+    /**
+     *
+     * @returns
+     */
+    static usrLibPath() {
+        let path = '';
+        if (process.arch === 'x64') {
+            path = 'x86_64-linux-gnu';
+        }
+        else if (process.arch === 'arm64') {
+            path = 'aarch64-linux-gnu';
+        }
+        return path;
+    }
+    /**
+     * get the kernel version
+     */
+    static kernelVersion() {
+        return os.release();
+    }
+}

package/dist/classes/utils.d/console-output.d.ts

@@ -0,0 +1,26 @@
+/**
+ * ./src/classes/utils.d/console-output.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * Console output utilities - colored output, titles, warnings, errors
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export default class ConsoleOutput {
+    /**
+     *
+     * @param msg
+     */
+    static warning(msg?: string): void;
+    static error(msg?: string): void;
+    /**
+     * titles
+     * Penguin's are gettings alive!
+     */
+    static titles(command?: string): void;
+    /**
+     *
+     * @returns flag
+     */
+    static flag(): string;
+}

package/dist/classes/utils.d/console-output.js

@@ -0,0 +1,46 @@
+/**
+ * ./src/classes/utils.d/console-output.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * Console output utilities - colored output, titles, warnings, errors
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import chalk from 'chalk';
+// pjson
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const pjson = require('../../../package.json');
+export default class ConsoleOutput {
+    /**
+     *
+     * @param msg
+     */
+    static warning(msg = '') {
+        console.log(pjson.shortName + ' >>> ' + chalk.cyanBright(msg) + '.');
+    }
+    static error(msg = '') {
+        console.error(pjson.shortName + ' >>> ' + chalk.bgMagentaBright(chalk.whiteBright(msg)) + '.');
+    }
+    /**
+     * titles
+     * Penguin's are gettings alive!
+     */
+    static titles(command = '') {
+        console.clear();
+        console.log('');
+        console.log(' E G G S: the reproductive system of penguins');
+        console.log('');
+        console.log(ConsoleOutput.flag());
+        console.log('command: ' + chalk.bgBlack.white(command) + '\n');
+    }
+    /**
+     *
+     * @returns flag
+     */
+    static flag() {
+        return chalk.bgGreen.whiteBright('      ' + pjson.name + '      ') +
+            chalk.bgWhite.blue(" Perri's Brewery edition ") +
+            chalk.bgRed.whiteBright('       ver. ' + pjson.version + '       ');
+    }
+}

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

@@ -0,0 +1,53 @@
+/**
+ * ./src/classes/utils.d/filesystem.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * Filesystem operations utilities - files, UUID, disk space
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+import IOsRelease from '../../interfaces/i-os-release.js';
+export default class Filesystem {
+    /**
+     *
+     * @param file
+     * @param search
+     * @returns value
+     */
+    static searchOnFile(file?: string, search?: string): string;
+    /**
+     * restituisce uuid
+     * @param device
+     */
+    static uuid(device: string): string;
+    /**
+     *
+     * @param device
+     * @returns
+     */
+    static uuidGen(): string;
+    /**
+     * Calculate the space used on the disk
+     * @return {void}
+     */
+    static getUsedSpace(): number;
+    /**
+     * write a file
+     * @param file
+     * @param text
+     */
+    static write(file: string, text: string): void;
+    /**
+     *
+     * @param file
+     * @param cmd
+     */
+    static writeX(file: string, cmd: string): void;
+    /**
+     *
+     * @param file
+     * @param cmd
+     */
+    static writeXs(file: string, cmds: string[]): void;
+    static getOsRelease(): IOsRelease;
+}