penguins-eggs 9.5.19 → 9.5.21

package/dist/classes/ovary.js

@@ -5,37 +5,35 @@
  * mail: piero.proietti@gmail.com
  *
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 // packages
-const fs_1 = __importDefault(require("fs"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const node_path_1 = __importDefault(require("node:path"));
-const node_os_1 = __importDefault(require("node:os"));
-const shelljs_1 = __importDefault(require("shelljs"));
-const chalk_1 = __importDefault(require("chalk"));
-const mustache_1 = __importDefault(require("mustache"));
-const pve_live_1 = __importDefault(require("./pve-live"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const node_os_1 = tslib_1.__importDefault(require("node:os"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const mustache_1 = tslib_1.__importDefault(require("mustache"));
+const pve_live_1 = tslib_1.__importDefault(require("./pve-live"));
 // libraries
 const utils_1 = require("../lib/utils");
 // classes
-const utils_2 = __importDefault(require("./utils"));
-const n8_1 = __importDefault(require("./n8"));
-const incubator_1 = __importDefault(require("./incubation/incubator"));
-const xdg_1 = __importDefault(require("./xdg"));
-const pacman_1 = __importDefault(require("./pacman"));
-const settings_1 = __importDefault(require("./settings"));
-const systemctl_1 = __importDefault(require("./systemctl"));
-const bleach_1 = __importDefault(require("./bleach"));
-const yolk_1 = __importDefault(require("./yolk"));
+const utils_2 = tslib_1.__importDefault(require("./utils"));
+const n8_1 = tslib_1.__importDefault(require("./n8"));
+const incubator_1 = tslib_1.__importDefault(require("./incubation/incubator"));
+const xdg_1 = tslib_1.__importDefault(require("./xdg"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
+const settings_1 = tslib_1.__importDefault(require("./settings"));
+const systemctl_1 = tslib_1.__importDefault(require("./systemctl"));
+const bleach_1 = tslib_1.__importDefault(require("./bleach"));
+const yolk_1 = tslib_1.__importDefault(require("./yolk"));
 const displaymanager_1 = require("./incubation/fisherman-helper/displaymanager");
 // backup
 const promises_1 = require("fs/promises");
 const fs_2 = require("fs");
-const users_1 = __importDefault(require("./users"));
-const cli_autologin_1 = __importDefault(require("../lib/cli-autologin"));
+const users_1 = tslib_1.__importDefault(require("./users"));
+const cli_autologin_1 = tslib_1.__importDefault(require("../lib/cli-autologin"));
 /**
  * Ovary:
  */
@@ -54,6 +52,7 @@ class Ovary {
         this.clone = false;
         this.cryptedclone = false;
         this.cliAutologin = new cli_autologin_1.default();
+        this.ovarium = '';
     }
     /**
      * @returns {boolean} success
@@ -81,6 +80,7 @@ class Ovary {
             if (await utils_2.default.customConfirm('Select yes to continue...')) {
                 return true;
             }
+            this.settings.work_dir.ovarium = this.settings.config.snapshot_dir + 'ovarium/';
         }
         return false;
     }
@@ -217,10 +217,10 @@ class Ovary {
             }
             if (cryptedclone) {
                 await (0, utils_1.exec)('eggs syncto', utils_2.default.setEcho(true));
-                utils_2.default.warning(`Waiting 10s, before to move ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
+                utils_2.default.warning(`Waiting 10s, before to move ${luksFile} in ${this.ovarium}iso/live`);
                 await (0, utils_1.exec)('sleep 10', utils_2.default.setEcho(false));
-                utils_2.default.warning(`moving ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
-                await (0, utils_1.exec)(`mv ${luksFile} ${this.settings.config.snapshot_dir}ovarium/iso/live`, this.echo);
+                utils_2.default.warning(`moving ${luksFile} in ${this.ovarium}iso/live`);
+                await (0, utils_1.exec)(`mv ${luksFile} ${this.ovarium}iso/live`, this.echo);
             }
             const xorrisoCommand = this.makeDotDisk(clone, cryptedclone);
             /**
@@ -228,9 +228,9 @@ class Ovary {
              */
             if (this.familyId === 'archlinux') {
                 if (this.settings.distro.distroId === 'ManjaroLinux') {
-                    await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}manjaro/x86_64 -p`, this.echo);
-                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${this.settings.work_dir.pathIso}manjaro/x86_64/livefs.sfs`, this.echo);
-                    await (0, utils_1.exec)(`md5sum ${this.settings.work_dir.pathIso}live/filesystem.squashfs > ${this.settings.work_dir.pathIso}manjaro/x86_64/livefs.md5`, this.echo);
+                    await (0, utils_1.exec)(`mkdir ${this.settings.iso_work}manjaro/x86_64 -p`, this.echo);
+                    await (0, utils_1.exec)(`ln ${this.settings.iso_work}live/filesystem.squashfs ${this.settings.iso_work}manjaro/x86_64/livefs.sfs`, this.echo);
+                    await (0, utils_1.exec)(`md5sum ${this.settings.iso_work}live/filesystem.squashfs > ${this.settings.iso_work}manjaro/x86_64/livefs.md5`, this.echo);
                 }
                 else if (this.settings.distro.distroId === 'Arch' ||
                     this.settings.distro.distroId === 'blendOS' ||
@@ -238,9 +238,9 @@ class Ovary {
                     this.settings.distro.distroId === 'phyOS' ||
                     this.settings.distro.distroId === 'RebornOS' ||
                     this.settings.distro.distroId === 'EndeavourOS') {
-                    await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}arch/x86_64 -p`, this.echo);
-                    await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}live/filesystem.squashfs          ${this.settings.work_dir.pathIso}arch/x86_64/airootfs.sfs`, this.echo);
-                    await (0, utils_1.exec)(`sha512sum ${this.settings.work_dir.pathIso}live/filesystem.squashfs > ${this.settings.work_dir.pathIso}arch/x86_64/airootfs.sha512`, this.echo);
+                    await (0, utils_1.exec)(`mkdir ${this.settings.iso_work}arch/x86_64 -p`, this.echo);
+                    await (0, utils_1.exec)(`ln ${this.settings.iso_work}live/filesystem.squashfs          ${this.settings.iso_work}arch/x86_64/airootfs.sfs`, this.echo);
+                    await (0, utils_1.exec)(`sha512sum ${this.settings.iso_work}live/filesystem.squashfs > ${this.settings.iso_work}arch/x86_64/airootfs.sha512`, this.echo);
                 }
             }
             await this.makeIso(xorrisoCommand, scriptOnly);
@@ -250,17 +250,18 @@ class Ovary {
      * Crea la struttura della workdir
      */
     async liveCreateStructure() {
+        // efi-work iso  memdiskDir sotto mountpoint
         if (this.verbose) {
-            console.log('Overy: liveCreateStructure');
+            console.log('Ovary: liveCreateStructure');
         }
-        utils_2.default.warning(`Creating egg in ${this.settings.work_dir.path}`);
+        utils_2.default.warning(`Creating egg in ${this.settings.config.snapshot_dir}`);
         let cmd;
-        if (!fs_1.default.existsSync(this.settings.work_dir.path)) {
-            cmd = `mkdir -p ${this.settings.work_dir.path}`;
+        if (!fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
+            cmd = `mkdir -p ${this.settings.config.snapshot_dir}`;
             this.tryCatch(cmd);
         }
-        if (!fs_1.default.existsSync(this.settings.work_dir.path + '/README.md')) {
-            cmd = `cp ${node_path_1.default.resolve(__dirname, '../../conf/README.md')} ${this.settings.work_dir.path}README.md`;
+        if (!fs_1.default.existsSync(this.settings.config.snapshot_dir + '/README.md')) {
+            cmd = `cp ${node_path_1.default.resolve(__dirname, '../../conf/README.md')} ${this.settings.config.snapshot_dir}README.md`;
             this.tryCatch(cmd);
         }
         if (!fs_1.default.existsSync(this.settings.work_dir.lowerdir)) {
@@ -281,17 +282,15 @@ class Ovary {
         }
         /**
          * Creo le directory di destinazione per boot, efi, isolinux e live
-         * precedentemente in isolinux
          */
-        if (!fs_1.default.existsSync(this.settings.work_dir.pathIso)) {
-            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/boot/grub/${utils_2.default.machineUEFI()}`;
+        if (!fs_1.default.existsSync(this.settings.iso_work)) {
+            cmd = `mkdir -p ${this.settings.iso_work}/boot/grub/${utils_2.default.machineUEFI()}`;
             this.tryCatch(cmd);
-            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/efi/boot`;
+            cmd = `mkdir -p ${this.settings.iso_work}/efi/boot`;
             this.tryCatch(cmd);
-            const liveBsseDir = 'live';
-            cmd = `mkdir -p ${this.settings.work_dir.pathIso}/isolinux`;
+            cmd = `mkdir -p ${this.settings.iso_work}/isolinux`;
             this.tryCatch(cmd);
-            cmd = `mkdir -p ${this.settings.work_dir.pathIso}live`;
+            cmd = `mkdir -p ${this.settings.iso_work}live`;
             this.tryCatch(cmd);
         }
     }
@@ -531,17 +530,17 @@ class Ovary {
             console.log('ovary: syslinux');
             console.log('syslinux path: ' + this.settings.distro.syslinuxPath);
         }
-        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/vesamenu.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
-        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/chain.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
+        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/vesamenu.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
+        await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/chain.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
         /**
          * per openSuse non sono riusciuto a determinare
          * quale pacchetto installi:
          * ldllinux.c43, libcom32 e libutil.c32
          */
         if (this.familyId !== 'suse') {
-            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/ldlinux.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
-            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libcom32.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
-            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libutil.c32 ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
+            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/ldlinux.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
+            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libcom32.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
+            await (0, utils_1.exec)(`cp ${this.settings.distro.syslinuxPath}/libutil.c32 ${this.settings.iso_work}/isolinux/`, this.echo);
         }
     }
     /**
@@ -554,11 +553,11 @@ class Ovary {
         /**
          * isolinux.bin
          */
-        await (0, utils_1.exec)(`cp ${this.settings.distro.isolinuxPath}/isolinux.bin ${this.settings.work_dir.pathIso}/isolinux/`, this.echo);
+        await (0, utils_1.exec)(`cp ${this.settings.distro.isolinuxPath}/isolinux.bin ${this.settings.iso_work}/isolinux/`, this.echo);
         /**
          * isolinux.theme.cfg
          */
-        const isolinuxThemeDest = this.settings.work_dir.pathIso + 'isolinux/isolinux.theme.cfg';
+        const isolinuxThemeDest = this.settings.iso_work + 'isolinux/isolinux.theme.cfg';
         let isolinuxThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.theme.cfg`);
         if (this.theme.includes('/')) {
             isolinuxThemeSrc = `${theme}/theme/livecd/isolinux.theme.cfg`;
@@ -571,7 +570,7 @@ class Ovary {
         /**
          * isolinux.cfg from isolinux.template.cfg
          */
-        const isolinuxDest = this.settings.work_dir.pathIso + 'isolinux/isolinux.cfg';
+        const isolinuxDest = this.settings.iso_work + 'isolinux/isolinux.cfg';
         const isolinuxTemplate = node_path_1.default.resolve(__dirname, '../../addons/templates/isolinux.template');
         if (!fs_1.default.existsSync(isolinuxTemplate)) {
             utils_2.default.warning('Cannot find: ' + isolinuxTemplate);
@@ -590,7 +589,7 @@ class Ovary {
         /**
          * splash
          */
-        const splashDest = `${this.settings.work_dir.pathIso}/isolinux/splash.png`;
+        const splashDest = `${this.settings.iso_work}/isolinux/splash.png`;
         let splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
         if (this.theme.includes('/')) {
             splashSrc = node_path_1.default.resolve(`${theme}/theme/livecd/splash.png`);
@@ -634,7 +633,7 @@ class Ovary {
         }
         let lackVmlinuzImage = false;
         if (fs_1.default.existsSync(this.settings.kernel_image)) {
-            await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, this.echo);
+            await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.iso_work}/live/`, this.echo);
         }
         else {
             utils_2.default.error(`Cannot find ${this.settings.kernel_image}`);
@@ -652,7 +651,7 @@ class Ovary {
     async initrdCreate() {
         let initrdImg = utils_2.default.initrdImg();
         initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
-        utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.work_dir.pathIso}/live/`);
+        utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.iso_work}/live/`);
         const distroId = this.settings.distro.distroId;
         let fileConf = 'archlinux';
         if (distroId === 'Arch' ||
@@ -673,7 +672,7 @@ class Ovary {
             fileConf = distroId.toLowerCase();
         }
         let pathConf = node_path_1.default.resolve(__dirname, `../../mkinitcpio/${fileConf}/live.conf`);
-        await (0, utils_1.exec)(`mkinitcpio -c ${pathConf} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        await (0, utils_1.exec)(`mkinitcpio -c ${pathConf} -g ${this.settings.iso_work}/live/${initrdImg}`, utils_2.default.setEcho(true));
     }
     /**
      * We must upgrade to initrdCreate for Debian/Ubuntu
@@ -686,7 +685,7 @@ class Ovary {
             isCrypted = true;
             await (0, utils_1.exec)('mv /etc/crypttab /etc/crypttab.saved', this.echo);
         }
-        await (0, utils_1.exec)(`mkinitramfs -o ${this.settings.work_dir.pathIso}/live/initrd.img-$(uname -r) ${this.toNull}`, this.echo);
+        await (0, utils_1.exec)(`mkinitramfs -o ${this.settings.iso_work}/live/initrd.img-$(uname -r) ${this.toNull}`, this.echo);
         if (isCrypted) {
             await (0, utils_1.exec)('mv /etc/crypttab.saved /etc/crypttab', this.echo);
         }
@@ -698,7 +697,7 @@ class Ovary {
         }
         let lackInitrdImage = false
         if (fs.existsSync(this.settings.initrd_image)) {
-          await exec(`cp ${this.settings.initrd_image} ${this.settings.work_dir.pathIso}/live/`, this.echo)
+          await exec(`cp ${this.settings.initrd_image} ${this.settings.iso_work}/live/`, this.echo)
         } else {
           Utils.error(`Cannot find ${this.settings.initrdImg}`)
           lackInitrdImage = true
@@ -750,14 +749,14 @@ class Ovary {
             // this.addRemoveExclusion(true, '/etc/localtime')
         }
         this.addRemoveExclusion(true, this.settings.config.snapshot_dir /* .absolutePath() */);
-        if (fs_1.default.existsSync(`${this.settings.work_dir.pathIso}/live/filesystem.squashfs`)) {
-            fs_1.default.unlinkSync(`${this.settings.work_dir.pathIso}/live/filesystem.squashfs`);
+        if (fs_1.default.existsSync(`${this.settings.iso_work}/live/filesystem.squashfs`)) {
+            fs_1.default.unlinkSync(`${this.settings.iso_work}/live/filesystem.squashfs`);
         }
         const compression = `-comp ${this.settings.config.compression}`;
-        //let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.session_excludes}`
-        let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`;
+        //let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.iso_work}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.session_excludes}`
+        let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.iso_work}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`;
         cmd = cmd.replace(/\s\s+/g, ' ');
-        utils_2.default.writeX(`${this.settings.work_dir.path}mksquashfs`, cmd);
+        utils_2.default.writeX(`${this.settings.work_dir.ovarium}mksquashfs`, cmd);
         if (!scriptOnly) {
             utils_2.default.warning('squashing filesystem: ' + compression);
             await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
@@ -907,7 +906,8 @@ class Ovary {
             }
             cmds.push(endLine);
         }
-        utils_2.default.writeXs(`${this.settings.work_dir.path}bind`, cmds);
+        // Utils.writeXs(`${this.settings.config.snapshot_dir}bind`, cmds)
+        utils_2.default.writeXs(`${this.settings.work_dir.ovarium}bind`, cmds);
     }
     /**
      * ubind del fs live
@@ -931,7 +931,7 @@ class Ovary {
                 if (n8_1.default.isDirectory(dirname)) {
                     cmds.push(`\n# directory: ${dirname}`);
                     if (this.mergedAndOvelay(dirname)) {
-                        cmds.push(`\n# ${dirname} has overlay`, `\n# First, umount it from ${this.settings.work_dir.path}`);
+                        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));
                     }
@@ -942,7 +942,7 @@ class Ovary {
                     /**
                      * We can't remove the nest!!!
                      */
-                    const nest = this.settings.work_dir.path.split('/');
+                    const nest = this.settings.config.snapshot_dir.split('/');
                     if (dirname !== nest[1]) { // We can't remove first level nest
                         cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname} -rf`, this.verbose));
                     }
@@ -960,7 +960,8 @@ class Ovary {
         if (this.clone) {
             cmds.push(await rexec(`umount ${this.settings.work_dir.merged}/home`, this.verbose));
         }
-        utils_2.default.writeXs(`${this.settings.work_dir.path}ubind`, cmds);
+        // Utils.writeXs(`${this.settings.config.snapshot_dir}ubind`, cmds)
+        utils_2.default.writeXs(`${this.settings.work_dir.ovarium}ubind`, cmds);
     }
     /**
      * bind dei virtual file system
@@ -968,7 +969,8 @@ class Ovary {
     async bindVfs() {
         const cmds = [];
         cmds.push(`mount -o bind /dev ${this.settings.work_dir.merged}/dev`, `mount -o bind /dev/pts ${this.settings.work_dir.merged}/dev/pts`, `mount -o bind /proc ${this.settings.work_dir.merged}/proc`, `mount -o bind /sys ${this.settings.work_dir.merged}/sys`, `mount -o bind /run ${this.settings.work_dir.merged}/run`);
-        utils_2.default.writeXs(`${this.settings.work_dir.path}bindvfs`, cmds);
+        // Utils.writeXs(`${this.settings.config.snapshot_dir}bindvfs`, cmds)
+        utils_2.default.writeXs(`${this.settings.work_dir.ovarium}bindvfs`, cmds);
     }
     /**
      *
@@ -977,7 +979,8 @@ class Ovary {
     async ubindVfs() {
         const cmds = [];
         cmds.push(`umount ${this.settings.work_dir.merged}/dev/pts`, `umount ${this.settings.work_dir.merged}/dev`, `umount ${this.settings.work_dir.merged}/proc`, `umount ${this.settings.work_dir.merged}/run`, `umount ${this.settings.work_dir.merged}/sys`);
-        utils_2.default.writeXs(`${this.settings.work_dir.path}ubindvfs`, cmds);
+        // Utils.writeXs(`${this.settings.config.snapshot_dir}ubindvfs`, cmds)
+        utils_2.default.writeXs(`${this.settings.work_dir.ovarium}ubindvfs`, cmds);
     }
     /**
      *
@@ -1075,8 +1078,8 @@ class Ovary {
                 shelljs_1.default.cp(policySource, policyDest);
                 await (0, utils_1.exec)(`sed -i 's/auth_admin/yes/' ${policyDest}`);
                 // carico in filesystem.live packages-remove
-                shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/live-installer/filesystem.packages-remove'), `${this.settings.work_dir.pathIso}/live/`);
-                shelljs_1.default.touch(`${this.settings.work_dir.pathIso}/live/filesystem.packages`);
+                shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/live-installer/filesystem.packages-remove'), `${this.settings.iso_work}/live/`);
+                shelljs_1.default.touch(`${this.settings.iso_work}/live/filesystem.packages`);
                 installerUrl = 'penguins-live-installer.desktop';
                 installerIcon = 'utilities-terminal';
                 shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/penguins-live-installer.desktop'), `${this.settings.work_dir.merged}/usr/share/applications/`);
@@ -1222,10 +1225,12 @@ class Ovary {
         if (this.verbose) {
             console.log('ovary: makeEfi');
         }
-        const memdiskDir = this.settings.work_dir.path + 'memdiskDir';
+        // const memdiskDir = this.settings.work_dir.path + 'memdiskDir'
+        // const efiWorkDir = this.settings.efi_work
+        // const isoDir = this.settings.iso_work
+        const memdiskDir = this.settings.config.snapshot_mnt + 'memdiskDir';
         const efiWorkDir = this.settings.efi_work;
-        const isoDir = this.settings.work_dir.pathIso;
-        // const codenameLikeId = this.settings.distro.codenameLikeId
+        const isoDir = this.settings.iso_work;
         /**
          * il pachetto grub/grub2 DEVE essere presente
          */
@@ -1403,7 +1408,7 @@ class Ovary {
      * return mkiso
      */
     makeDotDisk(clone = false, cryptedclone = false) {
-        const dotDisk = this.settings.work_dir.pathIso + '/.disk';
+        const dotDisk = this.settings.iso_work + '/.disk';
         if (fs_1.default.existsSync(dotDisk)) {
             shelljs_1.default.rm('-rf', dotDisk);
         }
@@ -1413,7 +1418,7 @@ class Ovary {
         let content = utils_2.default.getVolid(this.settings.remix.name);
         fs_1.default.writeFileSync(file, content, 'utf-8');
         // .disk/mksquashfs
-        const scripts = this.settings.work_dir.path;
+        const scripts = this.settings.config.snapshot_dir;
         shelljs_1.default.cp(scripts + '/mksquashfs', dotDisk + '/mksquashfs');
         // .disk/mkisofs
         content = this.xorrisoCommand(clone, cryptedclone).replace(/\s\s+/g, ' ');
@@ -1448,7 +1453,7 @@ class Ovary {
         const postfix = utils_2.default.getPostfix();
         this.settings.isoFilename = prefix + volid + typology + postfix;
         // 
-        const output = this.settings.config.snapshot_dir + this.settings.isoFilename;
+        const output = this.settings.config.snapshot_mnt + this.settings.isoFilename;
         let command = '';
         // const appid = `-appid "${this.settings.distro.distroId}" `
         // const publisher = `-publisher "${this.settings.distro.distroId}/${this.settings.distro.codenameId}" `
@@ -1529,7 +1534,7 @@ class Ovary {
          ${uefi_e} \
          ${uefi_noEmulBoot} \
          ${uefi_isohybridGptBasdat}
-         ${this.settings.work_dir.pathIso}`
+         ${this.settings.iso_work}`
         */
         /**
          * how is made in refracta
@@ -1570,7 +1575,7 @@ class Ovary {
      ${uefi_e} \
      ${uefi_isohybridGptBasdat} \
      ${uefi_noEmulBoot} \
-     -o ${output} ${this.settings.work_dir.pathIso}`;
+     -o ${output} ${this.settings.iso_work}`;
         return command;
     }
     /**
@@ -1582,9 +1587,17 @@ class Ovary {
         if (this.verbose) {
             console.log('ovary: makeIso');
         }
-        utils_2.default.writeX(`${this.settings.work_dir.path}mkisofs`, cmd);
+        //Utils.writeX(`${this.settings.config.snapshot_dir}mkisofs`, cmd)
+        utils_2.default.writeX(`${this.settings.work_dir.ovarium}mkisofs`, cmd);
         if (!scriptOnly) {
-            await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
+            const test = (await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true))).code;
+            if (test !== 0) {
+                process.exit();
+            }
+            // Create link to iso
+            const src = this.settings.config.snapshot_mnt + this.settings.isoFilename;
+            const dest = this.settings.config.snapshot_dir + this.settings.isoFilename;
+            await (0, utils_1.exec)(`ln -s ${src} ${dest}`);
         }
     }
     /**
@@ -1597,9 +1610,9 @@ class Ovary {
             console.log('eggs is finished!\n\nYou can find the file iso: ' + chalk_1.default.cyanBright(this.settings.isoFilename) + '\nin the nest: ' + chalk_1.default.cyanBright(this.settings.config.snapshot_dir) + '.');
         }
         else {
-            console.log('eggs is finished!\n\nYou can find the scripts to build iso: ' + chalk_1.default.cyanBright(this.settings.isoFilename) + '\nin the ovarium: ' + chalk_1.default.cyanBright(this.settings.work_dir.path) + '.');
+            console.log('eggs is finished!\n\nYou can find the scripts to build iso: ' + chalk_1.default.cyanBright(this.settings.isoFilename) + '\nin the ovarium: ' + chalk_1.default.cyanBright(this.settings.config.snapshot_dir) + '.');
             console.log('usage');
-            console.log(chalk_1.default.cyanBright(`cd ${this.settings.work_dir.path}`));
+            console.log(chalk_1.default.cyanBright(`cd ${this.settings.config.snapshot_dir}`));
             console.log(chalk_1.default.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/pacman.js

@@ -5,22 +5,20 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const shelljs_1 = __importDefault(require("shelljs"));
-const utils_1 = __importDefault(require("./utils"));
-const distro_1 = __importDefault(require("./distro"));
-const settings_1 = __importDefault(require("./settings"));
+const tslib_1 = require("tslib");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
+const settings_1 = tslib_1.__importDefault(require("./settings"));
 const node_child_process_1 = require("node:child_process");
 const utils_2 = require("../lib/utils");
-const debian_1 = __importDefault(require("./family/debian"));
-const fedora_1 = __importDefault(require("./family/fedora"));
-const archlinux_1 = __importDefault(require("./family/archlinux"));
-const suse_1 = __importDefault(require("./family/suse"));
+const debian_1 = tslib_1.__importDefault(require("./family/debian"));
+const fedora_1 = tslib_1.__importDefault(require("./family/fedora"));
+const archlinux_1 = tslib_1.__importDefault(require("./family/archlinux"));
+const suse_1 = tslib_1.__importDefault(require("./family/suse"));
 const config_file = '/etc/penguins-eggs.d/eggs.yaml';
 const config_tools = '/etc/penguins-eggs.d/tools.yaml';
 /**
@@ -246,7 +244,18 @@ class Pacman {
                 await fedora_1.default.calamaresInstall(verbose);
             }
             else if (this.distro().familyId === 'archlinux') {
-                await archlinux_1.default.calamaresInstall(verbose);
+                if (this.distro().distroId === 'ManjaroLinux') {
+                    const cmd = `pacman -Sy --noconfirm calamares`;
+                    try {
+                        await (0, utils_2.exec)(cmd, utils_1.default.setEcho(true));
+                    }
+                    catch {
+                        utils_1.default.error(`manjaro: ${cmd}`); // + e.error)
+                    }
+                }
+                else {
+                    await archlinux_1.default.calamaresInstall(verbose);
+                }
             }
             else if (this.distro().familyId === 'suse') {
                 await suse_1.default.calamaresInstall(verbose);

package/dist/classes/pve-live.js

@@ -6,10 +6,8 @@
  * license: MIT
  * pve-live
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * This will create a symbolic link from the system’s copy of the service file (usually in /lib/systemd/system or /etc/systemd/system)
  * into the location on disk where systemd looks for autostart files (usually /etc/systemd/system/some_target.target.wants.
@@ -18,9 +16,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * sudo systemctl disable application.service
  * This will remove the symbolic link that indicated that the service should be started automatically.
  */
-const systemctl_1 = __importDefault(require("./systemctl"));
-const path_1 = __importDefault(require("path"));
-const shelljs_1 = __importDefault(require("shelljs"));
+const systemctl_1 = tslib_1.__importDefault(require("./systemctl"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 class PveLive {
     constructor() {
         this.systemctl = {};

package/dist/classes/pxe.js

@@ -1,24 +1,22 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs: pxe.ts
  * author: Piero Proietti
  * mail: piero.proietti@gmail.com
  */
 const utils_1 = require("../lib/utils");
-const distro_1 = __importDefault(require("./distro"));
-const fs_1 = __importDefault(require("fs"));
-const http_1 = __importDefault(require("http"));
-const node_static_1 = __importDefault(require("node-static"));
-const node_path_1 = __importDefault(require("node:path"));
-const settings_1 = __importDefault(require("./settings"));
-const utils_2 = __importDefault(require("./utils"));
-const tftp_1 = __importDefault(require("tftp"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const http_1 = tslib_1.__importDefault(require("http"));
+const node_static_1 = tslib_1.__importDefault(require("node-static"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const settings_1 = tslib_1.__importDefault(require("./settings"));
+const utils_2 = tslib_1.__importDefault(require("./utils"));
+const tftp_1 = tslib_1.__importDefault(require("tftp"));
 // @ts-ignore
-const etrick_1 = __importDefault(require("etrick"));
+const etrick_1 = tslib_1.__importDefault(require("etrick"));
 /**
 * Pxe:
 */
@@ -52,9 +50,9 @@ class Pxe {
             }
         }
         else {
-            this.eggRoot = node_path_1.default.dirname(this.settings.work_dir.path) + '/ovarium/iso/';
+            this.eggRoot = node_path_1.default.dirname(this.settings.config.snapshot_dir) + '/ovarium/iso/';
         }
-        if (!utils_2.default.isLive() && !fs_1.default.existsSync(this.settings.work_dir.path)) {
+        if (!utils_2.default.isLive() && !fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
             console.log('no image available, build an image with: sudo eggs produce');
             process.exit();
         }