penguins-eggs 9.1.34 → 9.2.2

package/lib/classes/bleach.js

@@ -22,12 +22,15 @@ class Bleach {
      * @param verbose
      */
     async clean(verbose = false) {
+        if (verbose) {
+            utils_1.default.warning('cleaning the system');
+        }
         const distro = new distro_1.default();
-        if (distro.distroLike === 'Debian' || distro.distroLike === 'Devuan' || (distro.distroLike === 'Ubuntu')) {
+        if (distro.familyId === 'debian') {
             await this.cleanApt(verbose);
         }
-        else if (distro.distroLike === 'Arch') {
-            await (0, utils_2.exec)('paccache -ruk0');
+        else if (distro.familyId === 'archlinux') {
+            await (0, utils_2.exec)('pacman -Scc', utils_1.default.setEcho(true));
         }
         await this.cleanHistory(verbose);
         await this.cleanJournal(verbose);
@@ -41,7 +44,6 @@ class Bleach {
         let echo = { echo: false, ignore: true, capture: false };
         if (verbose) {
             echo = { echo: true, ignore: true, capture: false };
-            utils_1.default.warning('cleaning apt');
         }
         await (0, utils_2.exec)('apt-get clean', echo);
         await (0, utils_2.exec)('apt-get autoclean', echo);

package/lib/classes/daddy.js

@@ -102,13 +102,14 @@ class Daddy {
                 const myAddons = {};
                 myAddons.adapt = true;
                 const backup = false;
+                const personal = false;
                 const scriptOnly = false;
                 const yolkRenew = false;
                 const final = false;
                 const ovary = new ovary_1.default();
                 utils_1.default.warning('Produce an egg...');
                 if (await ovary.fertilization(config.snapshot_prefix, config.snapshot_basename, config.theme, config.compression)) {
-                    await ovary.produce(backup, scriptOnly, yolkRenew, final, myAddons, verbose);
+                    await ovary.produce(backup, personal, scriptOnly, yolkRenew, final, myAddons, verbose);
                     ovary.finished(scriptOnly);
                 }
             }

package/lib/classes/distro.js

@@ -27,6 +27,10 @@
  * Ubuntu 21.10 (impish) active
  * Ubuntu 22.04 (jammy) LTS
  *
+ * Arch
+ * Manjaro Qonos
+ * Manjaro Ruah
+ *
  */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -203,6 +207,12 @@ class Distro {
                 this.codenameLikeId = 'bookworm';
                 break;
             }
+            case `hera`: {
+                // Elementary
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'bionic';
+                break;
+            }
             case `jolnir`: {
                 // Elementary
                 this.distroLike = 'Ubuntu';
@@ -301,18 +311,24 @@ class Distro {
             case 'n/a': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
+                this.codenameId = 'rolling';
                 this.codenameLikeId = 'rolling';
                 break;
             }
             /**
-             * GARUDA
+             * Manjaro
              */
-            case 'Harpy-Eagle': {
+            case 'Qonos':
+            case 'Ruah': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
                 this.codenameLikeId = 'rolling';
                 break;
             }
+            /**
+             * GARUDA
+             */
+            case 'Harpy-Eagle':
             case 'White-tailed-eagle': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
@@ -320,18 +336,8 @@ class Distro {
                 break;
             }
             /**
-             * Manjaro
+             * FEDORA
              */
-            case 'Qonos':
-            case 'Ruah': {
-                this.familyId = 'archlinux';
-                this.distroLike = 'Arch';
-                this.codenameLikeId = 'rolling';
-                break;
-                /**
-                 * Fedora
-                 */
-            }
             case 'ThirtyFive': {
                 this.familyId = 'fedora';
                 this.distroLike = 'Fedora';
@@ -366,9 +372,12 @@ class Distro {
         else {
             this.mountpointSquashFs = '/run/live/medium/live/filesystem.squashfs';
         }
-        if (this.familyId === "archlinux") {
+        if (this.distroId === "ManjaroLinux") {
             this.mountpointSquashFs = "/run/miso/bootmnt/live/filesystem.squashfs";
         }
+        else if (this.distroId === "Arch") {
+            this.mountpointSquashFs = "/run/archiso/bootmnt/live/filesystem.squashfs";
+        }
         /**
          * setting paths: syslinux, isolinux, usrLib
          */

package/lib/classes/family/archlinux.js

@@ -36,8 +36,12 @@ class Archlinux {
      * Crea array pacchetti da installare/rimuovere
      */
     static packages(remove = false, verbose = false) {
+        /**
+         * praticamente non serve, perche prende dal pacchetto o da pkgbuild
+         */
         // non può essere pacman è universalmente presente
-        const packages = ['arch-install-scripts', 'awk', 'dosfstools', 'e2fsprogs', 'erofs-utils', 'findutils', 'gzip', 'libarchive', 'libisoburn', 'mtools', 'openssl', 'pacman', 'rsync', 'sed', 'syslinux', 'squashfs-tools'];
+        // 'pacman', 'awk', 'dosfstools'
+        const packages = ['']; // 'arch-install-scripts',  'e2fsprogs', 'erofs-utils', 'findutils', 'gzip', 'libarchive', 'libisoburn', 'mtools', 'openssl', 'rsync', 'sed', 'syslinux', 'squashfs-tools']
         const toInstall = [];
         const toRemove = [];
         for (const elem of packages) {
@@ -97,12 +101,12 @@ class Archlinux {
     static async calamaresInstall(verbose = false) {
         verbose = true; // serve per pacman
         const echo = utils_1.default.setEcho(verbose);
+        let cmd = `pacman -Sy --noconfirm ${(0, dependencies_1.array2spaced)(this.packs4calamares)}`;
         try {
-            // inserito flag --noconfirm
-            await (0, utils_2.exec)(`pacman -Sy --noconfirm ${(0, dependencies_1.array2spaced)(this.packs4calamares)}`, echo);
+            await (0, utils_2.exec)(cmd, echo);
         }
         catch {
-            utils_1.default.error(`Archlinux.calamaresInstall() pacman -Sy ${(0, dependencies_1.array2spaced)(this.packs4calamares)}`); // + e.error)
+            utils_1.default.error(`Archlinux.calamaresInstall(): ${cmd}`); // + e.error)
         }
     }
     /**

package/lib/classes/incubation/distros/bionic.d.ts

@@ -21,7 +21,7 @@ export declare class Bionic {
      * @param release
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -19,7 +19,7 @@ class Bionic {
      * @param release
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;

package/lib/classes/incubation/distros/buster.d.ts

@@ -23,7 +23,7 @@ export declare class Buster {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -21,7 +21,7 @@ class Buster {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;

package/lib/classes/incubation/distros/focal.d.ts

@@ -21,7 +21,7 @@ export declare class Focal {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -19,7 +19,7 @@ class Focal {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;

package/lib/classes/incubation/distros/jessie.d.ts

@@ -24,7 +24,7 @@ export declare class Jessie {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

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

@@ -21,7 +21,7 @@ class Jessie {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.release = false;

package/lib/classes/incubation/distros/rolling.d.ts

@@ -11,19 +11,19 @@ import { IInstaller, IRemix, IDistro } from '../../../interfaces';
  *
  */
 export declare class Rolling {
-    verbose: boolean;
     installer: IInstaller;
     remix: IRemix;
     distro: IDistro;
-    release: boolean;
     user_opt: string;
+    release: boolean;
+    verbose: boolean;
     /**
      * @param remix
      * @param distro
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, release: boolean, user_opt: string, verbose?: boolean);
+    constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, verbose?: boolean);
     /**
      *
      */

package/lib/classes/incubation/distros/rolling.js

@@ -21,10 +21,10 @@ class Rolling {
      * @param displaymanager
      * @param verbose
      */
-    constructor(installer, remix, distro, release, user_opt, verbose = false) {
-        this.verbose = false;
+    constructor(installer, remix, distro, user_opt, release = false, verbose = false) {
         this.installer = {};
         this.release = false;
+        this.verbose = false;
         this.installer = installer;
         this.remix = remix;
         this.distro = distro;
@@ -55,14 +55,13 @@ class Rolling {
         // await fisherman.buildCalamaresModule('bootloader-config', true)
         await fisherman.buildModule('grubcf');
         await fisherman.buildModule('bootloader');
-        await fisherman.modulePackages(this.distro, this.release); //
+        await fisherman.modulePackages(this.distro, this.release);
         await fisherman.buildModule('luksbootkeyfile');
         await fisherman.buildModule('plymouthcfg');
         // await fisherman.buildModule('initramfscfg')
         // await fisherman.buildModule('initramfs')
         await fisherman.moduleRemoveuser(this.user_opt);
-        // await fisherman.buildCalamaresModule('sources-yolk-unmount', false)
-        // await fisherman.buildCalamaresModule('remove-link')
+        await fisherman.shellprocess('removelink');
         await fisherman.buildModule('umount');
         await fisherman.moduleFinished();
     }

package/lib/classes/incubation/fisherman-helper/packages.d.ts

@@ -1,6 +1,10 @@
 import { IDistro } from '../../../interfaces';
 /**
+ * Work only with:
+ * - calamares
+ * - penguins-eggs
  *
+ * dependencies actually are removed by package managers
  */
 export declare function remove(distro: IDistro): string;
 /**

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

@@ -7,29 +7,22 @@ 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
  */
 function remove(distro) {
-    let remove = true;
-    let removePackages = pacman_1.default.packages(remove);
-    if (distro.distroLike === 'Arch') {
-        removePackages = ["calamares"];
-        removePackages = ["penguins-eggs"];
+    let removePackages = ["calamares"];
+    if (distro.familyId === 'archlinux') {
+        removePackages.push("penguins-eggs");
     }
-    else {
-        removePackages.push("calamares");
+    if (distro.familyId === 'debian') {
         removePackages.push("eggs");
     }
-    const mustRemain = ["coreutils", "cryptsetup", "curl", "dosfstools", "git", "parted", "rsync", "lvm2"];
-    let sorted = [];
-    for (const elem of removePackages) {
-        if (!mustRemain.includes(elem)) {
-            sorted.push(elem);
-        }
-    }
-    sorted = sorted.sort();
     let text = '  - remove:\n';
-    for (const elem of sorted) {
+    for (const elem of removePackages) {
         text += `    - ${elem.trim()}\n`;
     }
     return text;

package/lib/classes/incubation/fisherman.d.ts

@@ -69,7 +69,7 @@ export default class Fisherman {
     /**
      * usa i moduli-ts
      */
-    modulePackages(distro: IDistro, remove?: boolean): Promise<void>;
+    modulePackages(distro: IDistro, release?: boolean): Promise<void>;
     /**
      * Al momento rimane con la vecchia configurazione
      */

package/lib/classes/incubation/fisherman.js

@@ -32,13 +32,25 @@ class Fisherman {
         if (utils_1.default.isSystemd()) {
             hasSystemd = '- ';
         }
+        /**
+         * Controllo se è un clone
+         */
+        let filePersonal = `/home/eggs/ovarium/iso/live/is-clone.md`;
+        if (utils_1.default.isLive()) {
+            filePersonal = node_path_1.default.dirname(this.distro.mountpointSquashFs) + `/is-clone.md`;
+        }
         let hasDisplaymanager = '# ';
-        if ((0, displaymanager_1.displaymanager)() !== '') {
-            hasDisplaymanager = '- ';
+        let createUsers = '# ';
+        if (!node_fs_1.default.existsSync(filePersonal)) {
+            createUsers = '- ';
+            if ((0, displaymanager_1.displaymanager)() !== '') {
+                hasDisplaymanager = '- ';
+            }
         }
         shelljs_1.default.sed('-i', '{{hasSystemd}}', hasSystemd, settings);
         shelljs_1.default.sed('-i', '{{hasDisplaymanager}}', hasDisplaymanager, settings);
         shelljs_1.default.sed('-i', '{{branding}}', branding, settings);
+        shelljs_1.default.sed('-i', '{{createUsers}}', createUsers, settings);
     }
     /**
      *
@@ -78,6 +90,7 @@ class Fisherman {
      * @param replaces [['search','replace']]
      */
     async buildModule(name, vendor = '') {
+        console.log('creating... ' + name);
         let moduleSource = node_path_1.default.resolve(__dirname, this.installer.templateModules + name + '.yml');
         /**
          * We need vendor here to have possibility to load custom modules for calamares
@@ -103,8 +116,9 @@ class Fisherman {
         }
         const moduleDest = this.installer.modules + name + '.conf';
         if (node_fs_1.default.existsSync(moduleSource)) {
-            if (this.verbose)
+            if (this.verbose) {
                 this.show(name, 'module', moduleDest);
+            }
             shelljs_1.default.cp(moduleSource, moduleDest);
         }
         else if (this.verbose) {
@@ -213,18 +227,18 @@ class Fisherman {
     /**
      * usa i moduli-ts
      */
-    async modulePackages(distro, remove = false) {
+    async modulePackages(distro, release = false) {
         const name = 'packages';
         const removePackages = require('./fisherman-helper/packages').remove;
         const tryInstall = require('./fisherman-helper/packages').tryInstall;
         this.buildModule(name);
-        if (remove) {
-            shelljs_1.default.sed('-i', '{{remove}}', removePackages(distro), this.installer.modules + name + '.conf');
-        }
-        else {
-            shelljs_1.default.sed('-i', '{{remove}}', '', this.installer.modules + name + '.conf');
+        let toRemove = '';
+        if (release) {
+            toRemove = removePackages(distro);
         }
-        shelljs_1.default.sed('-i', '{{try_install}}', tryInstall(distro), this.installer.modules + name + '.conf');
+        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');
     }
     /**
      * Al momento rimane con la vecchia configurazione

package/lib/classes/incubation/incubator.js

@@ -50,86 +50,90 @@ class Incubator {
         // DEBIAN
         switch (this.distro.codenameLikeId) {
             case 'jessie': {
-                const jessie = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const jessie = new jessie_1.Jessie(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await jessie.create();
                 break;
             }
             case 'stretch': {
-                const stretch = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const stretch = new jessie_1.Jessie(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await stretch.create();
                 break;
             }
             case 'buster': {
-                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await buster.create();
                 break;
             }
             case 'bullseye': {
-                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await bullseye.create();
                 break;
             }
             case 'bookworm': {
-                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await bookworm.create();
                 // DEVUAN
                 break;
             }
+            /**
+             * DEVUAL
+             */
             case 'beowulf': {
-                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await beowulf.create();
                 break;
             }
             case 'chimaera': {
-                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await chimaera.create();
                 break;
             }
             case 'daedalus': {
-                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await daedalus.create();
-                // UBUNTU
                 break;
             }
             /**
-             * Manjaro
+             * UBUNTU
              */
-            case 'rolling': {
-                release = true;
-                const rolling = new rolling_1.Rolling(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-                await rolling.create();
-                break;
-            }
             case 'focal': {
-                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await focal.create();
                 break;
             }
             case 'groovy': {
-                const groovy = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const groovy = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await groovy.create();
                 break;
             }
             case 'hirsute': {
-                const hirsute = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const hirsute = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await hirsute.create();
                 break;
             }
             case 'impish': {
-                const impish = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const impish = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await impish.create();
                 break;
             }
             case 'jammy': {
-                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await jammy.create();
                 break;
             }
             case 'bionic': {
-                const bionic = new bionic_1.Bionic(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                const bionic = new bionic_1.Bionic(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
                 await bionic.create();
                 break;
             }
+            /**
+             * Arch
+             */
+            case 'rolling': {
+                const rolling = new rolling_1.Rolling(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                await rolling.create();
+                break;
+            }
             // No default
         }
         this.createBranding();

package/lib/classes/ovary.d.ts

@@ -21,6 +21,7 @@ export default class Ovary {
     snapshot_prefix: string;
     snapshot_basename: string;
     compression: string;
+    clone: boolean;
     /**
      * @returns {boolean} success
      */
@@ -29,7 +30,7 @@ export default class Ovary {
      *
      * @param basename
      */
-    produce(backup: boolean | undefined, scriptOnly: boolean | undefined, yolkRenew: boolean | undefined, release: boolean | undefined, myAddons: IMyAddons, verbose?: boolean): Promise<void>;
+    produce(backup: boolean | undefined, clone: boolean | undefined, scriptOnly: boolean | undefined, yolkRenew: boolean | undefined, release: boolean | undefined, myAddons: IMyAddons, verbose?: boolean): Promise<void>;
     /**
      * Crea la struttura della workdir
      */