penguins-eggs 9.0.25 → 9.0.48

package/lib/classes/daddy.js

@@ -7,13 +7,13 @@ const tslib_1 = require("tslib");
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-const utils_1 = (0, tslib_1.__importDefault)(require("../classes/utils"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("../classes/pacman"));
-const settings_1 = (0, tslib_1.__importDefault)(require("../classes/settings"));
-const ovary_1 = (0, tslib_1.__importDefault)(require("../classes/ovary"));
-const compressors_1 = (0, tslib_1.__importDefault)(require("../classes/compressors"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
+const pacman_1 = tslib_1.__importDefault(require("../classes/pacman"));
+const settings_1 = tslib_1.__importDefault(require("../classes/settings"));
+const ovary_1 = tslib_1.__importDefault(require("../classes/ovary"));
+const compressors_1 = tslib_1.__importDefault(require("../classes/compressors"));
 const inquirer = require("inquirer");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const utils_2 = require("../lib/utils");
 class Daddy {
     constructor() {
@@ -46,7 +46,7 @@ class Daddy {
             }
             else {
                 if (config.snapshot_prefix === '') {
-                    config.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.versionId);
+                    config.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
                     config.compression = 'fast';
                 }
                 jsonConf = JSON.stringify(config);
@@ -114,21 +114,21 @@ class Daddy {
              * produce
              */
             if (loadDefault) {
-                flags += ' --verbose';
-                verbose = true;
+                verbose = false;
             }
             flags += ' --' + newConf.compression;
-            flags += ' --theme=' + config.theme;
+            flags += ' --addons adapt';
             utils_1.default.titles('produce' + ' ' + flags);
             console.log(chalk_1.default.cyan('Daddy, what else did you leave for me?'));
             const myAddons = {};
+            myAddons.adapt = true;
             const backup = false;
             const scriptOnly = false;
             const yolkRenew = false;
             const final = false;
-            const ovary = new ovary_1.default(config.snapshot_prefix, config.snapshot_basename, config.theme, config.compression);
+            const ovary = new ovary_1.default();
             utils_1.default.warning('Produce an egg...');
-            if (await ovary.fertilization()) {
+            if (await ovary.fertilization(config.snapshot_prefix, config.snapshot_basename, config.theme, config.compression)) {
                 await ovary.produce(backup, scriptOnly, yolkRenew, final, myAddons, verbose);
                 ovary.finished(scriptOnly);
             }
@@ -148,7 +148,7 @@ class Daddy {
             compressionOpt = 2;
         }
         if (c.snapshot_prefix === '') {
-            c.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.versionId);
+            c.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
         }
         return new Promise(function (resolve) {
             const questions = [

package/lib/classes/distro.d.ts

@@ -12,8 +12,10 @@ declare class Distro implements IDistro {
     familyId: string;
     distroId: string;
     distroLike: string;
-    versionId: string;
-    versionLike: string;
+    codenameId: string;
+    codenameLikeId: string;
+    releaseId: string;
+    releaseLike: string;
     usrLibPath: string;
     isolinuxPath: string;
     syslinuxPath: string;

package/lib/classes/distro.js

@@ -31,8 +31,8 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 /**
  * Classe
  */
@@ -41,8 +41,10 @@ class Distro {
         this.familyId = 'debian';
         this.distroId = '';
         this.distroLike = '';
-        this.versionId = '';
-        this.versionLike = '';
+        this.codenameId = '';
+        this.codenameLikeId = '';
+        this.releaseId = '';
+        this.releaseLike = '';
         this.usrLibPath = '/usr/lib';
         this.isolinuxPath = '';
         this.syslinuxPath = '';
@@ -79,172 +81,156 @@ class Distro {
             }
         }
         /**
-         * lsb_release -cs per versione ed lsb_release -is per distribuzione
+         * lsb_release -cs per codename (version)
+         * lsb_release -is per distribuzione
+         * lsb_release -rs per release
          */
-        this.versionId = shelljs_1.default.exec('lsb_release -cs', { silent: true }).stdout.toString().trim();
+        this.codenameId = shelljs_1.default.exec('lsb_release -cs', { silent: true }).stdout.toString().trim();
+        this.releaseId = shelljs_1.default.exec('lsb_release -rs', { silent: true }).stdout.toString().trim();
         this.distroId = shelljs_1.default.exec('lsb_release -is', { silent: true }).stdout.toString().trim();
         /**
-         * Per casi equivoci conviene normalizzare versionId
+         * releaseLike = releaseId
          */
-        switch (this.versionId) {
-            case 'n/a': {
-                // può essere Deepin apricot
-                if (this.distroId === 'Deepin') {
-                    this.versionId = 'apricot';
-                }
-                else if (node_fs_1.default.existsSync('/etc/debian_version')) {
-                    // bookworm?
-                    const debianVersion = node_fs_1.default.readFileSync('/etc/debian_version', 'utf8');
-                    if (debianVersion.trim() === 'bookworm/sid') {
-                        this.versionId = 'bookworm';
-                    }
-                }
-                break;
-            }
-            case 'sid': {
-                // sinora ho trovato solo siduction
-                if (node_fs_1.default.existsSync('/etc/debian_version')) {
-                    const debianVersion = node_fs_1.default.readFileSync('/etc/debian_version', 'utf8');
-                    if (debianVersion.trim() === 'bullseye/sid') {
-                        this.versionId = 'siduction';
-                    }
-                }
-                break;
-            }
-            case 'testing': {
-                if (this.distroId === 'Netrunner') {
-                    this.versionId = 'buster/sid';
-                }
-                break;
-            }
-            // No default
+        this.releaseLike = this.releaseId;
+        /**
+         * Per casi equivoci conviene normalizzare codenameId
+         *  -i, --id           show distributor ID
+         *  -r, --release      show release number of this distribution
+         *  -c, --codename     show code name of this distribution
+         */
+        if (this.distroId === 'Debian' && this.releaseId === 'unstable' && this.codenameId === 'sid') {
+            this.codenameId = 'bookworm';
+        }
+        else if (this.distroId === 'Debian' && this.releaseId === 'testing/unstable') {
+            this.codenameId = 'bookworm';
+            this.releaseLike = 'unstable';
         }
-        // Procedo analizzanto solo versionId...
-        // prima Debian, Devuan ed Ubuntu
-        switch (this.versionId) {
+        /**
+         * Procedo analizzanto: codenameId, prima Debian, Devuan ed Ubuntu poi gli altri
+         */
+        switch (this.codenameId) {
             case 'jessie': {
                 // Debian 8 jessie
                 this.distroLike = 'Debian';
-                this.versionLike = 'jessie';
+                this.codenameLikeId = 'jessie';
                 break;
             }
             case 'stretch': {
                 // Debian 9 stretch
                 this.distroLike = 'Debian';
-                this.versionLike = 'stretch';
+                this.codenameLikeId = 'stretch';
                 break;
             }
             case 'buster': {
                 // Debian 10 buster
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 break;
             }
             case 'bullseye': {
                 // Debian 11 bullseye
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'bookworm': {
                 // Debian 11 bullseye
                 this.distroLike = 'Debian';
-                this.versionLike = 'bookworm';
+                this.codenameLikeId = 'bookworm';
                 break;
             }
             case 'beowulf': {
                 this.distroLike = 'Devuan';
-                this.versionLike = 'beowulf';
+                this.codenameLikeId = 'beowulf';
                 break;
             }
             case 'chimaera': {
                 this.distroLike = 'Devuan';
-                this.versionLike = 'chimaera';
+                this.codenameLikeId = 'chimaera';
                 break;
             }
             case 'daedalus': {
                 this.distroLike = 'Devuan';
-                this.versionLike = 'daedalus';
+                this.codenameLikeId = 'daedalus';
                 break;
             }
             case 'xenial': {
                 // Ubuntu xenial
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'xenial';
+                this.codenameLikeId = 'xenial';
                 break;
             }
             case 'bionic': {
                 // Ubuntu 18.04 bionic LTS eol aprile 2023
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'bionic';
+                this.codenameLikeId = 'bionic';
                 break;
             }
             case 'focal': {
                 // Ubuntu 20.04 focal LTS
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'groovy': {
                 // Ubuntu 20.10 groovy
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'groovy';
+                this.codenameLikeId = 'groovy';
                 break;
             }
             case 'hirsute': {
                 // Ubuntu 21.04 hirsute
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'hirsute';
+                this.codenameLikeId = 'hirsute';
                 break;
             }
             case 'impish': {
                 // Ubuntu 21.10 impish
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'impish';
+                this.codenameLikeId = 'impish';
                 break;
             }
             case 'jammy': {
                 // Ubuntu 22.04 jammy
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'jammy';
+                this.codenameLikeId = 'jammy';
                 // quindi le derivate...
                 break;
             }
             case 'kali-rolling': {
                 // Kali
                 this.distroLike = 'Debian';
-                this.versionLike = 'bookworm';
-                // UfficioZero roma
+                this.codenameLikeId = 'bookworm';
                 break;
             }
             case `jolnir`: {
                 // Elementary
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'roma': {
                 // UfficioZero roma
                 this.distroLike = 'Devuan';
-                this.versionLike = 'beowulf';
+                this.codenameLikeId = 'beowulf';
                 break;
             }
             case 'tropea': {
                 // UfficioZero tropea
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'vieste': {
                 // UfficioZero tropea
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'bionic';
+                this.codenameLikeId = 'bionic';
                 break;
             }
             case 'siena': {
                 // UfficioZero siena
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 break;
             }
             case 'tara':
@@ -253,7 +239,7 @@ class Distro {
             case 'tricia': {
                 // LinuxMint 19.x
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'bionic';
+                this.codenameLikeId = 'bionic';
                 break;
             }
             case 'ulyana':
@@ -262,37 +248,49 @@ class Distro {
             case 'una': {
                 // LinuxMint 20.x
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'debbie': {
                 // LMDE 4 debbie
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 break;
             }
             case 'elsie': {
                 // LMDE 5 elsie
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'apricot': {
                 // Deepin 20 apricot
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
+                break;
+            }
+            case 'mierda': {
+                // Caraco
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'bullseye';
+                break;
+            }
+            case 'filadelfia': {
+                // SysLinuxOS
+                this.distroLike = 'Debian';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'siduction': {
                 // Debian 11 Siduction
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'buster/sid': {
                 // Netrunner
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 /**
                  * ArchLinux
                  */
@@ -304,13 +302,13 @@ class Distro {
             case 'Harpy-Eagle': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
-                this.versionLike = 'rolling';
+                this.codenameLikeId = 'rolling';
                 break;
             }
             case 'White-tailed-eagle': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
-                this.versionLike = 'rolling';
+                this.codenameLikeId = 'rolling';
                 break;
             }
             /**
@@ -319,7 +317,7 @@ class Distro {
             case 'Qonos': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
-                this.versionLike = 'rolling';
+                this.codenameLikeId = 'rolling';
                 break;
                 /**
                  * Fedora
@@ -328,7 +326,7 @@ class Distro {
             case 'ThirtyFive': {
                 this.familyId = 'fedora';
                 this.distroLike = 'Fedora';
-                this.versionLike = 'thirtyfive';
+                this.codenameLikeId = 'thirtyfive';
                 break;
                 /**
                  * openSuse
@@ -337,8 +335,8 @@ class Distro {
             case 'tumbleweed': {
                 this.familyId = 'suse';
                 this.distroLike = 'SUSE';
-                this.versionId = 'tumbleweed';
-                this.versionLike = 'tumbleweed';
+                this.codenameId = 'tumbleweed';
+                this.codenameLikeId = 'tumbleweed';
                 break;
             }
             default: {
@@ -347,13 +345,13 @@ class Distro {
                  */
                 console.log("This distro is not yet recognized, I'll try Debian buster");
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
             }
         }
         /**
          * Selezione il mountpoint per squashfs
          */
-        if (this.versionLike === 'jessie' || this.versionLike === 'stretch' || this.versionLike === 'bionic' || this.versionLike === 'xenial') {
+        if (this.codenameLikeId === 'jessie' || this.codenameLikeId === 'stretch' || this.codenameLikeId === 'bionic' || this.codenameLikeId === 'xenial') {
             this.mountpointSquashFs = '/lib/live/mount/medium/live/filesystem.squashfs';
         }
         else {

package/lib/classes/family/archlinux.js

@@ -7,10 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const utils_1 = (0, tslib_1.__importDefault)(require("../utils"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("../pacman"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const utils_1 = tslib_1.__importDefault(require("../utils"));
+const pacman_1 = tslib_1.__importDefault(require("../pacman"));
 const dependencies_1 = require("../../lib/dependencies");
 const utils_2 = require("../../lib/utils");
 /**

package/lib/classes/family/debian.js

@@ -7,10 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const utils_1 = (0, tslib_1.__importDefault)(require("../utils"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("../pacman"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const utils_1 = tslib_1.__importDefault(require("../utils"));
+const pacman_1 = tslib_1.__importDefault(require("../pacman"));
 const utils_2 = require("../../lib/utils");
 const dependencies_1 = require("../../lib/dependencies");
 /**
@@ -24,7 +24,7 @@ class Debian {
      */
     static isInstalledXorg() {
         let test = 'xserver-xorg-core';
-        if (pacman_1.default.distro().versionLike === 'bionic') {
+        if (pacman_1.default.distro().codenameLikeId === 'bionic') {
             /**
              * BUT_ on Ubuntu bionic we have:
              * xserver-xorg-core-hwe-18.04
@@ -69,7 +69,7 @@ class Debian {
             }
         }
         // Version e initType da controllare
-        const version = pacman_1.default.distro().versionLike;
+        const version = pacman_1.default.distro().codenameLikeId;
         for (const dep of dependencies_1.depVersions) {
             if (dep.versions.includes(version)) {
                 if (!this.packageIsInstalled(dep.package)) {

package/lib/classes/family/fedora.js

@@ -7,10 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const utils_1 = (0, tslib_1.__importDefault)(require("../utils"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("../pacman"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const utils_1 = tslib_1.__importDefault(require("../utils"));
+const pacman_1 = tslib_1.__importDefault(require("../pacman"));
 const dependencies_1 = require("../../lib/dependencies");
 const utils_2 = require("../../lib/utils");
 /**

package/lib/classes/family/suse.js

@@ -7,10 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
-const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
-const utils_1 = (0, tslib_1.__importDefault)(require("../utils"));
-const pacman_1 = (0, tslib_1.__importDefault)(require("../pacman"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const utils_1 = tslib_1.__importDefault(require("../utils"));
+const pacman_1 = tslib_1.__importDefault(require("../pacman"));
 const dependencies_1 = require("../../lib/dependencies");
 const utils_2 = require("../../lib/utils");
 /**

package/lib/classes/i18n.d.ts

@@ -1,14 +1,38 @@
+/**
+ * penguins-eggs:
+ * author: Piero Proietti
+ * mail: piero.proietti@gmail.com
+ *
+ */
 import Settings from './settings';
 /**
- * Ovary:
+ * I18n
  */
 export default class I18n {
     verbose: boolean;
+    echo: {};
+    toNull: string;
+    chroot: string;
     settings: Settings;
-    constructor(verbose?: boolean);
+    constructor(chroot?: string, verbose?: boolean);
+    /**
+     * reinstall
+     */
+    reinstall(): Promise<void>;
     /**
      *
-     * @param reinstall
      */
-    generate(reinstall?: boolean): void;
+    generate(fromSettings?: boolean, defaultLocale?: string, locales?: string[]): Promise<void>;
+    /**
+     * localeGen
+     */
+    private localeGen;
+    /**
+     * /etc/locale.conf
+     */
+    private localeConf;
+    /**
+   * /etc/default/locale
+   */
+    private defaultLocale;
 }