penguins-eggs 9.2.9 → 9.3.2

package/conf/distros/jessie/krill/settings.yml

@@ -87,7 +87,7 @@ sequence:
       - initramfs
       # dpkg-unsafe-io-undo
       - removeuser
-      - sources-yolk-unmount
+      - sources-yolk-undo
       - cleanup
       - umount
 

package/dist/classes/incubation/distros/bionic.js

@@ -59,7 +59,7 @@ class Bionic {
         await fisherman.buildCalamaresModule('add386arch', false);
         await fisherman.modulePackages(this.distro, this.release); //
         await fisherman.moduleRemoveuser(this.user_opt); //
-        await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.buildCalamaresModule('sources-yolk-undo', false);
         await fisherman.buildCalamaresModule('cleanup', true);
         await fisherman.buildModule('umount');
         await fisherman.buildModule('finished');

package/dist/classes/incubation/distros/buster.js

@@ -61,9 +61,9 @@ class Buster {
         await fisherman.buildModule('plymouthcfg');
         await fisherman.buildModule('initramfscfg');
         await fisherman.buildModule('initramfs');
-        await fisherman.moduleRemoveuser(this.user_opt);
         await fisherman.buildCalamaresModule('dpkg-unsafe-io-undo', false);
-        await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.moduleRemoveuser(this.user_opt);
+        await fisherman.buildCalamaresModule('sources-yolk-undo', false);
         await fisherman.buildCalamaresModule('cleanup', true);
         await fisherman.buildModule('umount');
         await fisherman.moduleFinished();

package/dist/classes/incubation/distros/focal.js

@@ -63,7 +63,7 @@ class Focal {
         await fisherman.modulePackages(this.distro, this.release); //
         await fisherman.moduleRemoveuser(this.user_opt);
         await fisherman.buildCalamaresModule('sources-yolk', false);
-        await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.buildCalamaresModule('sources-yolk-undo', false);
         await fisherman.buildCalamaresModule('cleanup', true);
         await fisherman.buildModule('umount');
         await fisherman.buildModule('finished');

package/dist/classes/incubation/distros/jessie.js

@@ -41,7 +41,7 @@ class Jessie {
         await fisherman.buildModule('partition', this.remix.branding);
         await fisherman.buildCalamaresModule('sources-yolk', true);
         await fisherman.moduleRemoveuser(this.user_opt);
-        await fisherman.buildCalamaresModule('sources-yolk-unmount', false);
+        await fisherman.buildCalamaresModule('sources-yolk-undo', false);
     }
 }
 exports.Jessie = Jessie;

package/dist/classes/incubation/fisherman-helper/packages.js

@@ -2,70 +2,63 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryInstall = exports.remove = void 0;
 const tslib_1 = require("tslib");
-/**
- *
- */
 const pacman_1 = tslib_1.__importDefault(require("../../pacman"));
 /**
- * Work only with:
- * - calamares
- * - penguins-eggs
  *
- * dependencies actually are removed by package managers
+ * @param distro
+ * @returns yaml-string
  */
 function remove(distro) {
-    let removePackages = ["calamares"];
+    let packages = ["calamares"];
     if (distro.familyId === 'archlinux') {
-        removePackages.push("penguins-eggs");
+        packages.push("penguins-eggs");
     }
     if (distro.familyId === 'debian') {
-        removePackages.push("eggs");
+        packages.push("eggs");
+    }
+    let yaml = '';
+    for (const elem of packages) {
+        yaml += `    - ${elem.trim()}\n`;
     }
-    let text = '  - remove:\n';
-    for (const elem of removePackages) {
-        text += `    - ${elem.trim()}\n`;
+    if (yaml !== '') {
+        yaml = '- remove:\n' + yaml;
     }
-    return text;
+    return yaml;
 }
 exports.remove = remove;
 /**
  *
  * @param distro
-   - try_install:
-      - language-pack-$LOCALE
-      - hunspell-$LOCALE
-      - libreoffice-help-$LOCALE
-
+ * @returns yaml-string
  */
 function tryInstall(distro) {
-    let packages = '';
+    let yaml = '';
     /**
      * Depending on the distro
      */
     if (distro.distroLike === 'Ubuntu') {
-        packages += '    - language-pack-$LOCALE\n';
+        yaml += '    - language-pack-$LOCALE\n';
     }
     // Da localizzare se presenti
     if (pacman_1.default.packageIsInstalled('hunspell')) {
-        packages += '    - hunspell-$LOCALE\n';
+        yaml += '    - hunspell-$LOCALE\n';
     }
     if (pacman_1.default.packageIsInstalled('libreoffice-base-core')) {
-        packages += `    - libreoffice-l10n-$LOCALE\n`;
-        packages += `    - libreoffice-help-$LOCALE\n`;
+        yaml += `    - libreoffice-l10n-$LOCALE\n`;
+        yaml += `    - libreoffice-help-$LOCALE\n`;
     }
     if (pacman_1.default.packageIsInstalled('firefox-esr')) {
-        packages += `    - firefox-esr-$LOCALE\n`;
+        yaml += `    - firefox-esr-$LOCALE\n`;
     }
     if (pacman_1.default.packageIsInstalled('firefox')) {
-        packages += `    - firefox-$LOCALE\n`;
+        yaml += `    - firefox-$LOCALE\n`;
     }
     if (pacman_1.default.packageIsInstalled('thunderbird')) {
-        packages += `    - thunderbird-locale-$LOCALE\n`;
+        yaml += `    - thunderbird-locale-$LOCALE\n`;
     }
-    let retVal = '';
-    if (packages !== '') {
-        retVal += '  - try_install:\n' + packages;
+    if (yaml !== '') {
+        yaml = '  - try_install:\n' + yaml;
     }
-    return retVal;
+    return yaml;
 }
 exports.tryInstall = tryInstall;

package/dist/classes/incubation/fisherman.js

@@ -232,13 +232,16 @@ class Fisherman {
         const removePackages = require('./fisherman-helper/packages').remove;
         const tryInstall = require('./fisherman-helper/packages').tryInstall;
         this.buildModule(name);
-        let toRemove = '';
+        let yamlInstall = tryInstall(distro);
+        let yamlRemove = '';
         if (release) {
-            toRemove = removePackages(distro);
+            yamlRemove = removePackages(distro);
         }
-        let toInstall = tryInstall(distro);
-        shelljs_1.default.sed('-i', '{{remove}}', toRemove, this.installer.modules + name + '.conf');
-        shelljs_1.default.sed('-i', '{{try_install}}', toInstall, this.installer.modules + name + '.conf');
+        let operations = '';
+        if (yamlRemove !== '' || yamlInstall !== '') {
+            operations = "operations:\n" + yamlRemove + yamlInstall;
+        }
+        shelljs_1.default.sed('-i', '{{operations}}', operations, this.installer.modules + name + '.conf');
     }
     /**
      * Al momento rimane con la vecchia configurazione

package/dist/classes/pacman.js

@@ -537,7 +537,7 @@ class Pacman {
             // Poi da buster
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
@@ -552,7 +552,7 @@ class Pacman {
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
@@ -567,7 +567,7 @@ class Pacman {
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
@@ -582,7 +582,7 @@ class Pacman {
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
@@ -597,7 +597,7 @@ class Pacman {
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-undo ${dest}/calamares/calamares-modules/sources-yolk-undo`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);

package/dist/classes/pxe.js

@@ -52,9 +52,9 @@ class Pxe {
         }
         this.nest = '/home/eggs';
         this.pxeRoot = this.nest + '/pxe';
-        console.log('nest: ' + this.nest);
-        console.log('pxeRoot: ' + this.pxeRoot);
-        console.log('eggRoot: ' + this.eggRoot);
+        // console.log('nest: ' + this.nest)
+        // console.log('pxeRoot: ' + this.pxeRoot)
+        // console.log('eggRoot: ' + this.eggRoot)
         /**
          * se pxeRoot non esiste viene creato
          */
@@ -168,7 +168,7 @@ class Pxe {
         content += `TIMEOUT 0\n`;
         content += `\n`;
         content += `label egg\n`;
-        content += `menu label ${this.bootLabel}\n`;
+        content += `menu label ${this.bootLabel.replace('.iso', '')}\n`;
         let clid = this.settings.distro.codenameLikeId;
         if (clid === 'bionic' || clid === 'stretch' || clid === 'jessie') {
             content += `kernel vmlinuz\n`;
@@ -178,7 +178,7 @@ class Pxe {
             content += `kernel http://${utils_1.default.address()}/vmlinuz\n`;
             content += `append initrd=http://${utils_1.default.address()}/initrd boot=live config noswap noprompt fetch=http://${utils_1.default.address()}/live/filesystem.squashfs\n`;
         }
-        content += `SYSAPPEND 3\n`;
+        content += `sysappend 3\n`;
         content += `\n`;
         if (this.isos.length > 0) {
             content += `menu separator\n`;
@@ -188,7 +188,7 @@ class Pxe {
                 content += `menu label ${iso}\n`;
                 content += `kernel http://${utils_1.default.address()}/memdisk\n`;
                 content += `initrd http://${utils_1.default.address()}/${iso}\n`;
-                content += `append  iso raw\n`;
+                content += `append  iso raw sysappend 3\n`;
             }
         }
         let file = `${this.pxeRoot}/pxelinux.cfg/default`;
@@ -232,7 +232,7 @@ class Pxe {
          * content += `imgargs vmlinuz fetch=http://${Utils.address()}/live/filesystem.squashfs boot=live dhcp initrd=initrd ro\n`
          */
         content += `imgargs vmlinuz fetch=http://${utils_1.default.address()}/live/filesystem.squashfs boot=live dhcp initrd=initrd ro\n`;
-        content += `sleep 10\n`;
+        content += `sleep 5\n`;
         content += `boot || goto start\n\n`;
         if (this.isos.length > 0) {
             for (const iso of this.isos) {

package/dist/classes/xdg.js

@@ -12,6 +12,7 @@ const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const pacman_1 = tslib_1.__importDefault(require("./pacman"));
 const utils_1 = tslib_1.__importDefault(require("./utils"));
+const n8_1 = tslib_1.__importDefault(require("./n8"));
 // libraries
 const utils_2 = require("../lib/utils");
 const xdg_dirs = ['DESKTOP', 'DOWNLOAD', 'TEMPLATES', 'PUBLICSHARE', 'DOCUMENTS', 'MUSIC', 'PICTURES', 'VIDEOS'];
@@ -93,10 +94,12 @@ class Xdg {
                 let files = node_fs_1.default.readdirSync(dc);
                 for (const elem of files) {
                     const curFile = dc + elem;
-                    let content = node_fs_1.default.readFileSync(curFile, 'utf8');
-                    let find = `[Seat:*]`;
-                    if (content.includes(find)) {
-                        shelljs_1.default.sed('-i', `autologin-user=${olduser}`, `autologin-user=${newuser}`, curFile);
+                    if (!n8_1.default.isDirectory(curFile)) {
+                        let content = node_fs_1.default.readFileSync(curFile, 'utf8');
+                        let find = `[Seat:*]`;
+                        if (content.includes(find)) {
+                            shelljs_1.default.sed('-i', `autologin-user=${olduser}`, `autologin-user=${newuser}`, curFile);
+                        }
                     }
                 }
             }

package/dist/commands/tools/ppa.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+/**
+ * penguins-eggs-v7 based on Debian live
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+const core_1 = require("@oclif/core");
+const distro_1 = tslib_1.__importDefault(require("../../classes/distro"));
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const utils_2 = require("../../lib/utils");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const fkey = `/etc/apt/trusted.gpg.d/penguins-eggs-key.gpg`;
+const flist = '/etc/apt/sources.list.d/penguins-eggs-ppa.list';
+/**
+ *
+ */
+class Ppa extends core_1.Command {
+    async run() {
+        const { flags } = await this.parse(Ppa);
+        utils_1.default.titles(this.id + ' ' + this.argv);
+        let verbose = false;
+        if (flags.verbose) {
+            verbose = true;
+        }
+        const distro = new distro_1.default();
+        if (distro.familyId === 'debian') {
+            if (utils_1.default.isRoot()) {
+                if (flags.remove) {
+                    utils_1.default.warning(`Are you sure to remove ${flist} to your repositories?`);
+                    if (await utils_1.default.customConfirm('Select yes to continue...')) {
+                        await remove();
+                    }
+                }
+                if (flags.add) {
+                    utils_1.default.warning(`Are you sure to add ${flist} to your repositories?`);
+                    if (await utils_1.default.customConfirm('Select yes to continue...')) {
+                        await clean();
+                        await add();
+                    }
+                }
+            }
+        }
+        else {
+            utils_1.default.warning('you can use ppa only for debian family');
+        }
+    }
+}
+exports.default = Ppa;
+Ppa.description = 'add/remove PPA repositories (Debian family)';
+Ppa.flags = {
+    help: core_1.Flags.help({ char: 'h' }),
+    add: core_1.Flags.boolean({ char: 'a', description: 'add penguins-eggs PPA repository' }),
+    remove: core_1.Flags.boolean({ char: 'r', description: 'remove penguins-eggs PPA repository' }),
+    verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' })
+};
+/**
+ * add ppa
+ */
+async function add() {
+    await (0, utils_2.exec)(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${fkey} > /dev/null`);
+    const content = `deb [signed-by=${fkey}] https://pieroproietti.github.io/penguins-eggs-ppa ./\n`;
+    fs_1.default.writeFileSync(flist, content);
+    await (0, utils_2.exec)(`apt-get update`);
+}
+/**
+ * remove ppa
+ */
+async function remove() {
+    await clean();
+    await (0, utils_2.exec)(`apt-get update`);
+}
+/**
+ *
+ */
+async function clean() {
+    await (0, utils_2.exec)(`rm -f    /etc/apt/trusted.gpg.d/penguins-eggs*`);
+    await (0, utils_2.exec)(`rm -f /etc/apt/sources.list.d/penguins-eggs*`);
+    await (0, utils_2.exec)(`rm -f /usr/share/keyrings/penguins-eggs*`);
+}

package/dist/krill/krill-sequence.js

@@ -225,6 +225,16 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
+            // dpkg-unsafe-io
+            message = "dpkg-unsafe-io";
+            percent = 0.11;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await this.execCalamaresModule('dpkg-unsafe-io');
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            }
             /**
              * IF RESTORE USERS DATA
              */
@@ -340,6 +350,16 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
+            // dpkg-unsafe-io
+            message = "dpkg-unsafe-io-undo";
+            percent = 0.61;
+            try {
+                await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+                await this.execCalamaresModule('dpkg-unsafe-io-undo');
+            }
+            catch (error) {
+                await utils_1.default.pressKeyToExit(JSON.stringify(error));
+            }
             /**
              * IF NOT RESTORE USERS DATA OR PERSONAL BACKUP
              */
@@ -403,7 +423,7 @@ class Sequence {
             // cleanup
             await cliAutologin.msgRemove(`${this.installTarget}/etc/motd`);
             await cliAutologin.msgRemove(`${this.installTarget}/etc/issue`);
-            // bootloader-config [moved to the end]
+            // bootloader-config
             message = "bootloader-config ";
             percent = 0.70;
             try {
@@ -413,7 +433,7 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // grubcfg [moved to the end]
+            // grubcfg 
             message = "grubcfg ";
             percent = 0.75;
             try {
@@ -423,7 +443,7 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // bootloader (grub-install) [moved to the end)
+            // bootloader (grub-install)
             message = "bootloader ";
             percent = 0.80;
             try {
@@ -433,13 +453,13 @@ class Sequence {
             catch (error) {
                 await utils_1.default.pressKeyToExit(JSON.stringify(error));
             }
-            // sourcesYolkUmount
+            // sources-yolk-undo
             if (this.distro.familyId === 'debian') {
-                message = "sources yolk unmount";
+                message = "sources-yolk-undo";
                 percent = 0.90;
                 try {
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
-                    await this.execCalamaresModule('sources-yolk-unmount');
+                    await this.execCalamaresModule('sources-yolk-undo');
                 }
                 catch (error) {
                     await utils_1.default.pressKeyToExit(JSON.stringify(error));

package/dist/krill/modules/packages.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const utils_1 = require("../../lib/utils");
 const utils_2 = tslib_1.__importDefault(require("../../classes/utils"));
+const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 /**
@@ -19,45 +20,50 @@ const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
  */
 async function packages() {
     let echoYes = utils_2.default.setEcho(true);
-    const config_file = `${this.installTarget}/etc/calamares/modules/packages.conf`;
+    let modulePath = '/etc/penguins-eggs.d/krill/';
+    if (pacman_1.default.packageIsInstalled('calamares')) {
+        modulePath = '/etc/calamares/';
+    }
+    const config_file = `${this.installTarget}${modulePath}modules/packages.conf`;
     if (fs_1.default.existsSync(config_file)) {
         const packages = js_yaml_1.default.load(fs_1.default.readFileSync(config_file, 'utf-8'));
-        /**
-         * we can do better, but work
-         */
-        let operations = JSON.parse(JSON.stringify(packages.operations));
-        let packagesToRemove = [];
-        let packagesTryInstall = [];
-        if (operations.length > 1) {
-            packagesToRemove = operations[0].remove;
-            packagesTryInstall = operations[1].try_install;
-        }
-        else {
-            packagesTryInstall = operations[0].try_install;
-        }
-        if (packages.backend === 'apt') {
-            if (packagesToRemove.length > 0) {
-                let ctr = `chroot ${this.installTarget} apt-get purge -y `;
-                for (const packageToRemove of packagesToRemove) {
-                    ctr += packageToRemove + ' ';
+        if (packages.operations !== undefined) {
+            if (packages.backend === 'apt') {
+                /**
+                 * apt: Debian/Devuan/Ubuntu
+                 */
+                if (packages.operations.remove !== undefined) {
+                    let cmd = `chroot ${this.installTarget} apt-get purge -y `;
+                    for (const elem of packages.operations.remove) {
+                        cmd += elem + ' ';
+                    }
+                    await (0, utils_1.exec)(`${cmd} ${this.toNull}`, this.echo);
                 }
-                await (0, utils_1.exec)(`${ctr} ${this.toNull}`, this.echo);
-                await (0, utils_1.exec)(`chroot ${this.installTarget} apt-get autoremove -y ${this.toNull}`, this.echo);
-            }
-            for (const packageToInstall of packagesTryInstall) {
-                await (0, utils_1.exec)(`chroot ${this.installTarget} apt-get purge -y ${packageToInstall} ${this.toNull}`, this.echo);
-            }
-        }
-        else if (packages.backend === 'pacman') {
-            if (packagesToRemove.length > 0) {
-                let ctr = `chroot ${this.installTarget} pacman -S `;
-                for (const packageToRemove of packagesToRemove) {
-                    ctr += packageToRemove + ' ';
+                if (packages.operations.try_install !== undefined) {
+                    let cmd = `chroot ${this.installTarget} apt-get install -y `;
+                    for (const elem of packages.operations.try_install) {
+                        cmd += elem + ' ';
+                    }
+                    await (0, utils_1.exec)(`chroot ${this.installTarget} apt-get update ${this.toNull}`, this.echo);
+                    await (0, utils_1.exec)(`${cmd} ${this.toNull}`, this.echo);
                 }
-                await (0, utils_1.exec)(`${ctr} ${echoYes}`, this.echo);
             }
-            for (const packageToInstall of packagesTryInstall) {
-                await (0, utils_1.exec)(`chroot ${this.installTarget} pacman -S ${packageToInstall}`, echoYes);
+            else if (packages.backend === 'pacman') {
+                /**
+                 * pacman: arch/manjaro
+                 */
+                if (packages.operations.remove !== undefined) {
+                    let cmd = `chroot ${this.installTarget} pacman -R\n`;
+                    for (const elem of packages.operations.remove) {
+                        cmd += elem + ' ';
+                    }
+                    await (0, utils_1.exec)(`${cmd} ${echoYes}`, this.echo);
+                }
+                if (packages.operations.try_install !== undefined) {
+                    for (const elem of packages.operations.try_install) {
+                        await (0, utils_1.exec)(`chroot ${this.installTarget} pacman -S ${elem}`, echoYes);
+                    }
+                }
             }
         }
     }

package/dist/lib/dependencies.js

@@ -52,6 +52,7 @@ exports.depCommon = [
     'live-boot-initramfs-tools',
     'lvm2',
     'parted',
+    "pxelinux",
     'rsync',
     'squashfs-tools',
     'syslinux-common',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.2.9",
+  "version": "9.3.2",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"
@@ -55,7 +55,7 @@
     "globby": "^11",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
-    "perrisbrewery": "^9.1.37",
+    "perrisbrewery": "^9.1.38",
     "ts-node": "^10.8.1",
     "typedoc": "^0.23.10"
   },

package/conf/distros/buster/calamares/calamares-modules/sources-yolk/sources-yolk.working.sh

@@ -1,75 +0,0 @@
-#!/bin/bash
-
-#
-# Questa versione utilizza SOLO yolk 
-# durante l'installazione.
-# sources-yolk.sh
-#    aggiunge yolk, rimuove list ed esegue apt non autenticato
-# sources-yolk.sh
-# -u rimuove yolk e ri-aggiunge le list
-
-function main {
-    #####################################################################
-    # unmount: remove yolk.list
-    #####################################################################
-    if [ "$1" = "-u" ]; then
-        remove_yolk
-    else
-        add_yolk
-    fi
-}
-
-
-#####################################################################
-function remove_list {
-    if [ -f "$LIST_BACKUP" ]; then
-        rm "$LIST_BACKUP"
-    fi
-    mv "$LIST $LIST_BACKUP"
-
-    if [ -d "$LIST_D_BACKUP" ]; then
-        rm "$LIST_D_BACKUP" -rf
-    fi
-    mv "$LIST_D $APT_LIST_D_BACKUP"
-}
-
-function add_list {
-    if [ -f "$LIST" ]; then
-        rm "$LIST" 
-    fi
-    mv "$APT_LIST_BACKUP $LIST"
-
-    if [ -d "$LIST_D" ]; then
-        rm "$LIST_D" -rf
-    fi        
-    mv "$LIST_D_BACKUP $LIST_D"
-}
-
-
-function add_yolk {
-    remove_list
-    cat << EOF > $CHROOT/etc/apt/sources.list.d/yolk.list
-    deb [trusted=yes] file:/var/local/yolk ./
-EOF
-    chroot $CHROOT apt-get --allow-unauthenticated update -y
-}
-
-function remove_yolk {
-    add_list
-    rm $CHROOT/etc/apt/sources.list.d/yolk.list
-    chroot $CHROOT apt-get update -y
-}
-
-
-
-# Lo script inizia qui
-CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-
-LIST = "$CHROOT/etc/apt/sources.list"
-LIST_BACKUP = "$LIST.backup"
-
-LIST_D = "$CHROOT/etc/apt/sources.list.d"
-LIST_D_BACKUP = "$LIST_D.backup"
-
-main $1
-exit 0