penguins-eggs 25.7.7 → 25.7.22

package/dist/classes/locales.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/locales.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/locales.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/locales.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/network.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/network.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/network.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/network.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/bind-live-fs.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/bind-live-fs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/bind-live-fs.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/bind-live-fs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
@@ -61,8 +61,12 @@ export async function bindLiveFs() {
             cmds.push(`# /${dir} is a directory`);
             if (dir !== 'ci' && dir !== 'lost+found') {
                 if (this.copied(dir)) {
-                    cmds.push(`# /${dir} is copied`);
-                    cmds.push(await rexec(`cp -r /${dir} ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose));
+                    cmds.push(`# /${dir} is copied if not exists on filesystem.squashfs`);
+                    let chkDir = path.join(this.settings.config.snapshot_mnt, 'filesystem.squashfs', dir);
+                    cmds.push(`if ! [ -d "${chkDir}" ]; then`);
+                    cmds.push(await rexec(`   cp -r /${dir} ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose));
+                    cmds.push(`fi`);
+                    continue;
                 }
                 else if (this.mergedAndOverlay(dir)) {
                     cmds.push(`# /${dir} mergedAndOverlay (rw)\n`, '# create mountpoint lower');
@@ -125,7 +129,11 @@ export async function uBindLiveFs() {
             cmds.push(startLine);
             if (fs.statSync(`/${dirname}`).isDirectory()) {
                 cmds.push(`\n# directory: ${dirname}`);
-                if (this.mergedAndOverlay(dirname)) {
+                if (this.copied(dirname)) {
+                    cmds.push(`\n# ${dirname} was copied, do nothings`);
+                    continue;
+                }
+                else if (this.mergedAndOverlay(dirname)) {
                     cmds.push(`\n# ${dirname} has overlay`, `\n# First, umount it from ${this.settings.config.snapshot_dir}`);
                     cmds.push(await rexec(`umount ${this.settings.work_dir.merged}/${dirname}`, this.verbose), `\n# Second, umount it from ${this.settings.work_dir.lowerdir}`);
                     cmds.push(await rexec(`umount ${this.settings.work_dir.lowerdir}/${dirname}`, this.verbose));
@@ -138,8 +146,8 @@ export async function uBindLiveFs() {
                  * We can't remove the nest!!!
                  */
                 const nest = this.settings.config.snapshot_dir.split('/');
+                // We can't remove first level nest
                 if (dirname !== nest[1]) {
-                    // We can't remove first level nest
                     cmds.push(await rexec(`rm -rf ${this.settings.work_dir.merged}/${dirname}`, this.verbose));
                 }
             }

package/dist/classes/ovary.d/bind-vfs.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/bind-live-fs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/bind-vfs.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/bind-live-fs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/create-xdg-autostart.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/create-xdg-autostart.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/create-xdg-autostart.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/create-xdg-autostart.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/edit-live-fs.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/edit-live-fs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/edit-live-fs.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/edit-live-fs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/fertilization.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/xorriso-command.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

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

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/xorriso-command.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
@@ -20,6 +20,7 @@ export async function fertilization(snapshot_prefix = '', snapshot_basename = ''
     const distro = new Distro();
     this.familyId = distro.familyId;
     this.distroId = distro.distroId;
+    this.distroLike = distro.distroLike;
     this.settings = new Settings();
     if (await this.settings.load()) {
         await this.settings.loadRemix(this.theme);

package/dist/classes/ovary.d/finished.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/finished.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

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

@@ -1,11 +1,13 @@
 /**
  * ./src/classes/ovary.d/finished.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
  */
 import chalk from 'chalk';
+// packages
+import path from 'path';
 // interfaces
 // libraries
 // classes
@@ -18,9 +20,10 @@ import Utils from './../utils.js';
 export function finished(scriptOnly = false) {
     Utils.titles('produce');
     if (scriptOnly) {
-        console.log('eggs is finished!\n\nYou can find the scripts to build iso: ' + chalk.cyanBright(this.settings.isoFilename) + '\nin the ovarium: ' + chalk.cyanBright(this.settings.config.snapshot_dir) + '.');
+        const pathOvarium = path.join(this.settings.config.snapshot_dir, 'ovarium');
+        console.log('eggs is finished!\n\nYou can find the scripts to build iso: ' + chalk.cyanBright(this.settings.isoFilename) + '\nin the ovarium: ' + chalk.cyanBright(pathOvarium) + '.');
         console.log('usage');
-        console.log(chalk.cyanBright(`cd ${this.settings.config.snapshot_dir}`));
+        console.log(chalk.cyanBright(`cd ${pathOvarium}`));
         console.log(chalk.cyanBright('sudo ./bind'));
         console.log('Make all yours modifications in the directories filesystem.squashfs and iso.');
         console.log('After when you are ready:');

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

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/initrd-arch.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

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

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/initrd-arch.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
@@ -21,7 +21,7 @@ export async function initrdAlpine() {
     let initrdImg = Utils.initrdImg();
     initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
     const pathConf = path.resolve(__dirname, `../../../mkinitfs/live.conf`);
-    await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg} ${this.kernel}`, Utils.setEcho(true));
+    await exec(`mkinitfs -c ${pathConf} -o ${this.settings.iso_work}live/${initrdImg} ${this.kernel}`, this.echo);
 }
 /**
  * initrdArch
@@ -51,9 +51,9 @@ export async function initrdArch() {
         await exec(`cp ${hookSrc} ${hookDest}`);
     }
     await exec(`cp ${hookSrc} ${hookSaved}`);
-    await exec(edit, Utils.setEcho(true));
+    await exec(edit, this.echo);
     let cmd = `mkinitcpio -c ${fileConf} -g ${this.settings.iso_work}live/${path.basename(this.initrd)} -k ${this.kernel}`;
-    await exec(cmd, Utils.setEcho(true));
+    await exec(cmd, this.echo);
     await exec(`rm -f ${hookDest}`);
     if (restore) {
         await exec(`cp ${hookSaved} ${hookDest}`);

package/dist/classes/ovary.d/kernel-copy.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/produce.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/kernel-copy.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/produce.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

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

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/live-create-structure.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

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

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/live-create-structure.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/make-dot-disk.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/produce.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/make-dot-disk.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/produce.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/make-efi.d.ts

@@ -1,12 +1,16 @@
 /**
  * ./src/classes/ovary.d/make-efi.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
  */
 import Ovary from '../ovary.js';
 /**
- * makeEFI
+ *
+ * @param this
+ * @param theme
+ * cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ./bootloaders/
+ * cp /usr/lib/shim/shimx64.efi.signed ./bootloaders/
  */
 export declare function makeEfi(this: Ovary, theme?: string): Promise<void>;

package/dist/classes/ovary.d/make-efi.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/make-efi.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
@@ -16,42 +16,32 @@ import Utils from '../utils.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 /**
- * makeEFI
+ *
+ * @param this
+ * @param theme
+ * cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ./bootloaders/
+ * cp /usr/lib/shim/shimx64.efi.signed ./bootloaders/
  */
 export async function makeEfi(theme = 'eggs') {
-    Utils.warning("creating efi configuration...");
+    const bootloaders = path.resolve(__dirname, `../../../bootloaders`);
+    const grubEfi = path.resolve(bootloaders, `grubx64.efi`);
+    const shimEfi = path.resolve(bootloaders, `shimx64.efi`);
+    let signed = '';
+    if (this.distroLike === 'Debian') {
+        Utils.warning(`Secure boot enabled on ${this.distroLike}`);
+        signed = '.signed';
+    }
     const efiPath = path.join(this.settings.config.snapshot_mnt, '/efi/');
     const efiWorkDir = path.join(efiPath, '/work/');
     const efiMemdiskDir = path.join(efiPath, '/memdisk/');
-    const efiMnt = path.join(efiPath, '/mnt/');
+    const efiMnt = path.join(efiPath, 'mnt');
     const isoDir = this.settings.iso_work;
-    const readmes = `${isoDir}/READMES`;
-    let readmeContent = `# README\n`;
-    /**
-     * check: grub/grub2 command MUST to exists
-     */
-    const grubName = Diversions.grubName(this.familyId);
-    if (grubName === '') {
-        Utils.error('Cannot find command grub/grub2.');
-        process.exit(1);
-    }
-    /**
-     * GAE = Grub Arch Efi path+grubx86.efi/signed
-     */
-    let GAE = srcGAES();
-    if (!fs.existsSync(srcGAE())) {
-        GAE = srcGAE();
-    }
-    if (!fs.existsSync(GAE)) {
-        if (this.familyId === 'debian') {
-            Utils.error(`error: ${GAE} does not exist`);
-            if (!Utils.isi686()) {
-                process.exit(1);
-            }
-        }
-    }
-    // Create READMES on ISO
-    await exec(`mkdir ${readmes}`);
+    // creo e copio direttamente in ${isdDir} il folder ${bootloaders}/grub/x86_64-efi
+    await exec(`mkdir ${isoDir}/boot/grub/ -p`, this.echo);
+    await exec(`cp -r ${bootloaders}/grub/x86_64-efi ${isoDir}/boot/grub/`, this.echo);
+    await exec(`mkdir ${isoDir}/EFI/boot -p`, this.echo);
+    await exec(`cp ${shimEfi}${signed} ${isoDir}/EFI/boot/${bootEFI()}`, this.echo);
+    await exec(`cp ${grubEfi}${signed} ${isoDir}/EFI/boot/${grubEFI()}`, this.echo);
     // clean/create all in efiPath
     if (fs.existsSync(efiPath)) {
         await exec(`rm -rf ${efiPath}`);
@@ -60,21 +50,19 @@ export async function makeEfi(theme = 'eggs') {
     await exec(`mkdir ${efiMemdiskDir}`, this.echo);
     await exec(`mkdir ${efiMnt}`, this.echo);
     await exec(`mkdir ${efiWorkDir}`, this.echo);
-    const grub1 = `${efiMemdiskDir}/boot/grub/grub.cfg`;
-    let grubText1 = `# grub.cfg 1\n`;
     /**
      * create efi.img
      */
-    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot")}`, this.echo);
-    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot/grub")}`, this.echo);
-    // create grub.cfg 1 in memdisk
-    Utils.warning("creating grub.cfg (1) in (efi.img)/boot/grub");
+    Utils.warning("creating grub.cfg (1) on efi.img");
+    await exec(`mkdir ${path.join(efiMemdiskDir, "/boot/grub -p")}`, this.echo);
+    const grubCfg1 = `${efiMemdiskDir}/boot/grub/grub.cfg`;
+    let grubText1 = `# grub.cfg 1\n`;
     grubText1 += `# created on ${efiMemdiskDir}\n`;
     grubText1 += `\n`;
     grubText1 += `search --set=root --file /.disk/id/${this.uuid}\n`;
     grubText1 += 'set prefix=($root)/boot/grub\n';
     grubText1 += `configfile ($root)/boot/grub/grub.cfg\n`;
-    Utils.write(grub1, grubText1);
+    Utils.write(grubCfg1, grubText1);
     /**
      * creating structure efiWordDir
      */
@@ -93,55 +81,24 @@ export async function makeEfi(theme = 'eggs') {
     const efiImg = `${efiWorkDir}boot/grub/efi.img`;
     await exec(`dd if=/dev/zero of=${efiImg} bs=1M count=16`, this.echo);
     await exec(`/sbin/mkdosfs -F 12 ${efiImg}`, this.echo);
-    // mount efi.img on mnt-img
-    await exec(`mount -o loop ${efiImg} ${efiMnt}`, this.echo);
-    // create structure inside efiMnt
-    await exec(`mkdir ${efiMnt}/boot`, this.echo);
-    await exec(`mkdir ${efiMnt}/boot/grub`, this.echo);
-    await exec(`mkdir ${efiMnt}/boot/grub/x86_64-efi`, this.echo);
-    await exec(`cp -r /usr/lib/grub/x86_64-efi/*.mod ${efiMnt}/boot/grub/x86_64-efi/`, this.echo);
-    await exec(`mkdir ${efiMnt}/EFI`, this.echo);
-    await exec(`mkdir ${efiMnt}/EFI/boot`, this.echo);
+    // await new Promise(resolve => setTimeout(resolve, 2000))
+    // mount efi.img on mountpoint mnt-img
+    await exec(`mount --make-shared -o loop ${efiImg} ${efiMnt}`, this.echo);
+    // await new Promise(resolve => setTimeout(resolve, 2000))
+    // create structure inside (efi.img)
+    await exec(`mkdir -p ${efiMnt}/boot/grub`, this.echo);
+    await exec(`mkdir -p ${efiMnt}/EFI/boot`, this.echo);
     /**
-     * copy grub.cfg to (efi.img)/boot/grub
+     * copy grubCfg1 (grub.cfg) to (efi.img)/boot/grub
      */
-    await exec(`cp ${grub1} ${efiMnt}/boot/grub`);
-    // readme
-    readmeContent += `## copyng on (efi.img) ${efiMnt}\n`;
-    readmeContent += `${grub1} copied to /boot/grub`;
-    if (this.settings.distro.codenameLikeId === 'bookworm' ||
-        this.settings.distro.codenameLikeId === 'daedalus') {
-        /**
-         * (efi.img)/EFI/boot/bootx84.efi (shimx64.efi)
-         * (efi.img)/EFI/boot/grubx84.efi
-         */
-        Utils.warning(`copy ${srcShim()} to ${efiMnt}/EFI/boot/${bootArchEfi()}`);
-        Utils.warning(`copy ${srcGAES()} to ${efiMnt}/EFI/boot/${nameGAE()}`);
-        await exec(`cp ${srcShim()} ${efiMnt}/EFI/boot/${bootArchEfi()}`, this.echo);
-        await exec(`cp ${srcGAES()} ${efiMnt}/EFI/boot/${nameGAE()}`, this.echo);
-        readmeContent += `${srcShim()} copied as  ${bootArchEfi()}\n`;
-        readmeContent += `${GAE} copied as ${nameGAE()}\n`;
-    }
-    else {
-        /**
-         * we need to build bootx64.efi
-         */
-        Utils.warning(`create ${bootArchEfi()} not signed and copy as ${bootArchEfi()}`);
-        await exec(`${grubName}-mkimage  -O "${Utils.uefiFormat()}" \
-                -m "${efiMemdiskDir}/memdisk" \
-                -o "${efiMemdiskDir}/${bootArchEfi()}" \
-                -p '(memdisk)/boot/grub' \
-                search iso9660 configfile normal memdisk tar cat part_msdos part_gpt fat ext2 ntfs ntfscomp hfsplus chain boot linux squash4 loopback`, this.echo);
-        await exec(`cp ${efiMemdiskDir}/${bootArchEfi()} ${efiMnt}/EFI/boot/`, this.echo);
-        // Rolf patch: copiare i file mod da /usr/lib/grub/x86_64-efi a ${isoDir}/boot/grub/x86_64-efi
-        await exec(`cp -r /usr/lib/grub/x86_64-efi/*.mod ${isoDir}/boot/grub/x86_64-efi/`, this.echo);
-        // Creare EFI
-        readmeContent += `created grubx64.efi not signed and copied as  ${bootArchEfi()}\n`;
-    }
-    // replicate EFI on ISO
-    await exec(`cp -r ${efiMnt}/EFI ${isoDir}/EFI`, this.echo);
-    // umount efiMnt
+    await exec(`cp ${grubCfg1} ${efiMnt}/boot/grub`, this.echo);
+    await exec(`cp ${shimEfi}${signed} ${efiMnt}/EFI/boot/${bootEFI()}`, this.echo);
+    await exec(`cp ${grubEfi}${signed} ${efiMnt}/EFI/boot/${grubEFI()}`, this.echo);
+    //await Utils.pressKeyToExit(`controlla ${efiMnt}`)
     await exec(`umount ${efiMnt}`, this.echo);
+    // Copy isoImg in ${${isoDir}/boot/grub
+    Utils.warning("copyng efi.img on (iso)/boot/grub");
+    await exec(`cp ${efiImg} ${isoDir}/boot/grub`, this.echo);
     /**
      * creating grub.cfg (2) on (iso)/boot/grub
      */
@@ -181,9 +138,6 @@ export async function makeEfi(theme = 'eggs') {
     }
     // Copy workdir files to ISO/boot
     await exec(`rsync -avx  ${efiWorkDir}/boot ${isoDir}/`, this.echo);
-    readmeContent += `\n`;
-    readmeContent += `## Copyng on ${isoDir}\n`;
-    readmeContent += `rsync -avx ${efiWorkDir}/boot (iso)/boot\n`;
     /**
      * prepare main grub.cfg from grub.main.cfg
      */
@@ -196,7 +150,7 @@ export async function makeEfi(theme = 'eggs') {
         process.exit(1);
     }
     const kernel_parameters = Diversions.kernelParameters(this.familyId, this.volid); // this.kernelParameters()
-    const g2 = path.join(isoDir, '/boot/grub/grub.cfg');
+    const grubCfg2 = path.join(isoDir, '/boot/grub/grub.cfg');
     const template = fs.readFileSync(grubTemplate, 'utf8');
     const view = {
         fullname: this.settings.remix.fullname.toUpperCase(),
@@ -206,10 +160,10 @@ export async function makeEfi(theme = 'eggs') {
         vmlinuz: `/live/${path.basename(this.vmlinuz)}`
     };
     let grubText2 = `# grub.cfg 2\n`;
-    grubText2 += ` # created on ${g2}`;
+    grubText2 += ` # created on ${grubCfg2}`;
     grubText2 += `\n`;
     grubText2 += mustache.render(template, view);
-    fs.writeFileSync(g2, grubText2);
+    fs.writeFileSync(grubCfg2, grubText2);
     /**
      * create loopback.cfg
      */
@@ -222,15 +176,15 @@ export async function makeEfi(theme = 'eggs') {
      * config.cfg
      */
     await exec(`cp ${path.resolve(__dirname, `../../../assets/config.cfg`)} ${isoDir}/boot/grub`);
-    fs.writeFileSync(`${readmes}/grub1.cfg`, grubText1);
-    fs.writeFileSync(`${readmes}/grub2.cfg`, grubText2);
-    fs.writeFileSync(`${readmes}/README.md`, readmeContent);
 }
+/**
+ * FUNCTIONS
+ */
 /**
  *
  * @returns
  */
-function bootArchEfi() {
+function bootEFI() {
     let bn = 'bootia32.efi'; // Per l'architettura i686 EFI è: bootia32.efi
     if (process.arch === 'x64') {
         bn = 'bootx64.efi';
@@ -241,9 +195,10 @@ function bootArchEfi() {
     return bn;
 }
 /**
- * FUNCTIONS
+ *
+ * @returns
  */
-function nameGAE() {
+function grubEFI() {
     let gn = 'grubia32.efi'; // Per l'architettura i686 EFI è: grubia32.efi
     if (process.arch === 'x64') {
         gn = 'grubx64.efi';
@@ -253,21 +208,6 @@ function nameGAE() {
     }
     return gn;
 }
-function nameGAES() {
-    return nameGAE() + '.signed';
-}
-function srcGAE() {
-    return '/usr/lib/grub/' + Utils.uefiFormat() + '/monolithic/' + nameGAE();
-}
-function srcGAES() {
-    let signedGrub = `/usr/lib/grub/${Utils.uefiFormat()}-signed/${nameGAES()}`;
-    if (!fs.existsSync(signedGrub)) {
-        Utils.warning(`warning: ${signedGrub} does not exist`);
-    }
-    return signedGrub;
-}
-function srcShim() {
-    const signedShim = '/usr/lib/shim/shimx64.efi.signed';
-    const unsignedShim = '/usr/lib/shim/shimx64.efi';
-    return fs.existsSync(signedShim) ? signedShim : unsignedShim;
+function moduleEFI() {
+    return `x86_64-efi`;
 }

package/dist/classes/ovary.d/make-iso.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/make-iso.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/make-iso.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/make-iso.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/make-squashfs.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/make-squashfs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/make-squashfs.js

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/make-squashfs.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT

package/dist/classes/ovary.d/merged.d.ts

@@ -1,6 +1,6 @@
 /**
  * ./src/classes/ovary.d/merge.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
+ * penguins-eggs v.25.7.x / ecmascript 2020
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT