penguins-eggs 9.1.31 → 9.1.34

package/README.md

@@ -132,7 +132,7 @@ $ npm install -g penguins-eggs
 $ eggs COMMAND
 running command...
 $ eggs (--version|-v)
-penguins-eggs/9.1.31 linux-x64 node-v16.15.1
+penguins-eggs/9.1.34 linux-x64 node-v16.15.1
 $ eggs --help [COMMAND]
 USAGE
   $ eggs COMMAND
@@ -155,6 +155,7 @@ USAGE
 * [`eggs info`](#eggs-info)
 * [`eggs install`](#eggs-install)
 * [`eggs kill`](#eggs-kill)
+* [`eggs krill`](#eggs-krill)
 * [`eggs mom`](#eggs-mom)
 * [`eggs produce`](#eggs-produce)
 * [`eggs remove`](#eggs-remove)
@@ -188,7 +189,7 @@ DESCRIPTION
   adapt monitor resolution for VM only
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -209,7 +210,7 @@ EXAMPLES
   $ sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -267,7 +268,7 @@ EXAMPLES
   install calamares and create it's configuration's files
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -291,7 +292,7 @@ EXAMPLES
   Configure and install prerequisites deb packages to run it
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/config.ts)_
 
 ## `eggs dad`
 
@@ -311,7 +312,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -402,7 +403,7 @@ DESCRIPTION
   informations about eggs configuration
 ```
 
-_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/info.ts)_
 
 ## `eggs install`
 
@@ -422,13 +423,14 @@ FLAGS
 DESCRIPTION
   command-line system installer - the egg became a penguin!
 
+ALIASES
+  $ eggs install
+
 EXAMPLES
   $ eggs install
   Install the system using GUI or CLI installer
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/install.ts)_
-
 ## `eggs kill`
 
 kill the eggs/free the nest
@@ -449,7 +451,35 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/kill.ts)_
+
+## `eggs krill`
+
+command-line system installer - the egg became a penguin!
+
+```
+USAGE
+  $ eggs krill [-c] [-k] [-p] [-h] [-v]
+
+FLAGS
+  -c, --cli      force use CLI installer
+  -h, --help     Show CLI help.
+  -k, --crypted  crypted CLI installation
+  -p, --pve      Proxmox VE install
+  -v, --verbose  verbose
+
+DESCRIPTION
+  command-line system installer - the egg became a penguin!
+
+ALIASES
+  $ eggs install
+
+EXAMPLES
+  $ eggs install
+  Install the system using GUI or CLI installer
+```
+
+_See code: [src/commands/krill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/krill.ts)_
 
 ## `eggs mom`
 
@@ -466,7 +496,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -527,7 +557,7 @@ EXAMPLES
   in /home/eggs/ovarium and you can customize all you need
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/produce.ts)_
 
 ## `eggs remove`
 
@@ -557,7 +587,7 @@ EXAMPLES
   remove eggs, eggs configurations, packages dependencies
 ```
 
-_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/remove.ts)_
+_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/remove.ts)_
 
 ## `eggs syncfrom`
 
@@ -581,7 +611,7 @@ EXAMPLES
   $ sudo eggs restore
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -604,7 +634,7 @@ EXAMPLES
   $ sudo eggs syncto
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -699,16 +729,27 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.31/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/update.ts)_
 
 ## `eggs version`
 
 ```
 USAGE
-  $ eggs version
+  $ eggs version [--json] [--verbose]
+
+FLAGS
+  --verbose  Show additional information about the CLI.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+FLAG DESCRIPTIONS
+  --verbose  Show additional information about the CLI.
+
+    Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.
 ```
 
-_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.0.4/src/commands/version.ts)_
+_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v1.1.1/src/commands/version.ts)_
 
 ## `eggs wardrobe get [REPO]`
 

package/conf/distros/buster/calamares/modules/locale.yml

@@ -18,13 +18,13 @@ zone:                       "Rome"
 # System locales are detected in the following order:
 #
 #  - /usr/share/i18n/SUPPORTED
-#  - localeGenPath (defaults to /etc/locale.gen if not set)
+#  - localeGenPath (defaults to /etc/ if not set)
 #  - 'locale -a' output
 #
 # Enable only when your Distribution is using an
-# custom path for locale.gen
+# custom path for 
 #
-#localeGenPath:             "PATH_TO/locale.gen"
+#localeGenPath:             "PATH_TO/"
 
 # GeoIP based Language settings: Leave commented out to disable GeoIP.
 #

package/conf/eggs.yaml

@@ -63,8 +63,8 @@ make_isohybrid: true
 
 # Compression algorithm
 # Allowed values are, in order of speed-size tradeoff: lz4, lzo, gzip, xz  
-# default xz
-compression: 'xz'
+# default -Xcompression-level 20
+compression: '-Xcompression-level 20'
 
 # Allow password login to ssh for users (not root).
 # If ssh_pass=true, then PasswordAuthentication will be set to true

package/lib/classes/compressors.d.ts

@@ -11,6 +11,13 @@ export default class Compressors {
     source: string;
     dest: string;
     populate(): Promise<void>;
+    fast(): string;
+    normal(): string;
+    /**
+     * max
+     * @returns
+     */
+    max(): string;
     private prepareCheck;
     private removeCheck;
     private check;

package/lib/classes/compressors.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 /**
- * test i compressori disponibili
+ * test available compressors
  */
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 class Compressors {
@@ -29,6 +29,43 @@ class Compressors {
         this.isEnabled.zstd = await this.check('zstd');
         await this.removeCheck();
     }
+    // fastest
+    fast() {
+        let comp = 'gzip';
+        if (this.isEnabled.zstd) {
+            comp = 'zstd -b 256K -Xcompression-level 1';
+        }
+        else if (this.isEnabled.lz4) {
+            comp = 'lz4';
+        }
+        return comp;
+    }
+    // normal
+    normal() {
+        let comp = "xz";
+        if (this.isEnabled.zstd) {
+            comp = 'zstd -b 256K -Xcompression-level 20';
+        }
+        else {
+            comp = 'xz -b 256K';
+        }
+        return comp;
+    }
+    /**
+     * max
+     * @returns
+     */
+    max() {
+        let comp = 'xz -b 256K -Xbcj ';
+        const filter = 'x86';
+        if (process.arch === 'arm') {
+            const filter = 'ARM'; // to check
+        }
+        else if (process.arch === 'arm64') {
+            const filter = 'ARM64'; // to check
+        }
+        return comp + filter;
+    }
     async prepareCheck() {
         shelljs_1.default.exec('rm -rf ' + this.source, { silent: true });
         shelljs_1.default.exec('mkdir ' + this.source, { silent: true });

package/lib/classes/daddy.js

@@ -60,39 +60,16 @@ class Daddy {
             config.root_passwd = newConf.root_passwd;
             config.theme = newConf.theme;
             /**
-             * Analisi del tipo di compressione del kernel
-             *
+             * Analisi del tipo di compressione disponibile
              */
             const compressors = new compressors_1.default();
             await compressors.populate();
-            let fastest = 'gzip';
-            if (compressors.isEnabled.zstd) {
-                fastest = 'zstd -Xcompression-level 1 -b 262144';
+            config.compression = compressors.normal();
+            if (newConf.compression === 'fast') {
+                config.compression = compressors.fast();
             }
-            else if (compressors.isEnabled.lz4) {
-                fastest = 'lz4';
-            }
-            switch (newConf.compression) {
-                case 'fast': {
-                    config.compression = fastest;
-                    break;
-                }
-                case 'normal': {
-                    config.compression = 'xz';
-                    break;
-                }
-                case 'max': {
-                    const filter = 'x86';
-                    if (process.arch === 'arm') {
-                        const filter = 'ARM'; // to check
-                    }
-                    else if (process.arch === 'arm64') {
-                        const filter = 'ARM64'; // to check
-                    }
-                    config.compression = 'xz -Xbcj ' + filter;
-                    break;
-                }
-                // No default
+            else if (newConf.compression === 'max') {
+                config.compression = compressors.max();
             }
             await this.settings.save(config);
             let flags = '';

package/lib/classes/distro.js

@@ -292,9 +292,16 @@ class Distro {
                 // Netrunner
                 this.distroLike = 'Debian';
                 this.codenameLikeId = 'buster';
-                /**
-                 * ArchLinux
-                 */
+                break;
+            }
+            /**
+             * Arch Linux
+             * distroId= "Arch"
+             */
+            case 'n/a': {
+                this.familyId = 'archlinux';
+                this.distroLike = 'Arch';
+                this.codenameLikeId = 'rolling';
                 break;
             }
             /**
@@ -315,7 +322,8 @@ class Distro {
             /**
              * Manjaro
              */
-            case 'Qonos': {
+            case 'Qonos':
+            case 'Ruah': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
                 this.codenameLikeId = 'rolling';

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

@@ -12,10 +12,13 @@ const pacman_1 = tslib_1.__importDefault(require("../../pacman"));
 function remove(distro) {
     let remove = true;
     let removePackages = pacman_1.default.packages(remove);
-    removePackages.push("calamares");
-    removePackages.push("eggs");
     if (distro.distroLike === 'Arch') {
-        removePackages = ["calamares"]; // penguins-eggs, manjaro-tools-iso, arch-install-scripts 
+        removePackages = ["calamares"];
+        removePackages = ["penguins-eggs"];
+    }
+    else {
+        removePackages.push("calamares");
+        removePackages.push("eggs");
     }
     const mustRemain = ["coreutils", "cryptsetup", "curl", "dosfstools", "git", "parted", "rsync", "lvm2"];
     let sorted = [];

package/lib/classes/keyboards.d.ts

@@ -9,37 +9,35 @@ export default class Keyboard {
     options: string[];
     constructor();
     /**
-     *
-     * @returns
+     * XKBMODEL[]
      */
     getModels(): IXkbModel[];
     /**
-     * 012345678901234567890123456789
-     * us              English (US)
+     * XKBLAYOUT=[]
      */
     getLayouts(): IXkbLayout[];
     /**
-     *
+     * IXkbVariant[]
      */
     getVariants(layout: string): IXkbVariant[];
     /**
-     *
+     * XKBOPTIONS[]
      */
     getOptions(): IXkbOption[];
     /**
-     *
+     * XKBMODEL='pc105'
      */
-    getVariant(): Promise<string>;
+    getModel(): Promise<string>;
     /**
-     *
+     * XKBLAYOUT='us'
      */
     getLayout(): Promise<string>;
     /**
-     *
+     * XKBVARIANT=''
      */
-    getModel(): Promise<string>;
+    getVariant(): Promise<string>;
     /**
-     *
+     * XKBOPTIONS=''
      */
     getOption(): Promise<string>;
 }

package/lib/classes/keyboards.js

@@ -68,8 +68,7 @@ class Keyboard {
         }
     }
     /**
-     *
-     * @returns
+     * XKBMODEL[]
      */
     getModels() {
         // 0123456789012345678901234567890123456789
@@ -84,12 +83,9 @@ class Keyboard {
         return oModels;
     }
     /**
-     * 012345678901234567890123456789
-     * us              English (US)
+     * XKBLAYOUT=[]
      */
     getLayouts() {
-        // 0123456789012345678901234567890123456789
-        // us              English (US)
         const oLayouts = [];
         for (const layout of this.layouts) {
             const l = {};
@@ -100,7 +96,7 @@ class Keyboard {
         return oLayouts;
     }
     /**
-     *
+     * IXkbVariant[]
      */
     getVariants(layout) {
         // 0123456789012345678901234567890123456789
@@ -118,7 +114,7 @@ class Keyboard {
         return aoVariants;
     }
     /**
-     *
+     * XKBOPTIONS[]
      */
     getOptions() {
         // 0123456789012345678901234567890123456789
@@ -133,27 +129,27 @@ class Keyboard {
         return aoOptions;
     }
     /**
-     *
+     * XKBMODEL='pc105'
      */
-    async getVariant() {
+    async getModel() {
         const file = '/etc/default/keyboard';
-        const cmd = `grep XKBVARIANT < ${file} | cut -f2 -d=|cut -f2 "-d\\""`;
-        let keyboardVariant = 'pc195';
+        const cmd = `grep XKBMODEL < ${file} |cut -f2 -d= | cut -f2 "-d\\""`;
+        let keyboardModel = 'pc105';
         if (fs_1.default.existsSync(file)) {
             const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
-                keyboardVariant = result.data.trim();
+                keyboardModel = result.data.trim();
             }
         }
-        return keyboardVariant;
+        return keyboardModel;
     }
     /**
-     *
+     * XKBLAYOUT='us'
      */
     async getLayout() {
         const file = '/etc/default/keyboard';
         const cmd = `grep XKBLAYOUT < /etc/default/keyboard | cut -f2 -d= | cut -f2 "-d\\""`;
-        let keyboardLayout = 'pc195';
+        let keyboardLayout = 'us';
         if (fs_1.default.existsSync(file)) {
             const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
@@ -163,22 +159,22 @@ class Keyboard {
         return keyboardLayout;
     }
     /**
-     *
+     * XKBVARIANT=''
      */
-    async getModel() {
+    async getVariant() {
         const file = '/etc/default/keyboard';
-        const cmd = `grep XKBMODEL < ${file} |cut -f2 -d= | cut -f2 "-d\\""`;
-        let keyboardModel = 'pc195';
+        const cmd = `grep XKBVARIANT < ${file} | cut -f2 -d=|cut -f2 "-d\\""`;
+        let keyboardVariant = '';
         if (fs_1.default.existsSync(file)) {
             const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
-                keyboardModel = result.data.trim();
+                keyboardVariant = result.data.trim();
             }
         }
-        return keyboardModel;
+        return keyboardVariant;
     }
     /**
-     *
+     * XKBOPTIONS=''
      */
     async getOption() {
         const file = '/etc/default/keyboard';

package/lib/classes/locales.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const utils_1 = require("../lib/utils");
 const fs_1 = tslib_1.__importDefault(require("fs"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
 class Locales {
     /**
      *
      */
     async getEnabled() {
+        // Restituisce i locales abilitati in Debian, per manjaro quelli presenti
+        // in /etc/locale.gen anche se #disabilitati
         const cmd = `localectl list-locales`;
         let enabledLocales = [];
         const result = await (0, utils_1.exec)(cmd, { capture: true, echo: false, ignore: false });
@@ -23,17 +26,19 @@ class Locales {
      *
      */
     async getSupported() {
-        const file = '/usr/share/i18n/SUPPORTED';
-        const cmd = `cut -f1 -d.|grep UTF-0 < ${file}`;
-        let lines = [];
-        const retLines = [];
-        if (fs_1.default.existsSync(file)) {
-            lines = fs_1.default.readFileSync(file, 'utf-8').split('\n');
-            for (const line of lines) {
-                retLines.push(line.replace(' UTF-8', ''));
-            }
+        const distro = new distro_1.default();
+        let supporteds = [];
+        if (distro.familyId === 'debian') {
+            supporteds = fs_1.default.readFileSync('/usr/share/i18n/SUPPORTED', 'utf-8').split('\n');
+        }
+        else if (distro.familyId === 'archlinux') {
+            supporteds = (await (0, utils_1.exec)('localectl list-locales', { capture: true, echo: false, ignore: false })).data.split('\n');
+        }
+        const elements = [];
+        for (const elem of supporteds) {
+            elements.push(elem.replace(' UTF-8', ''));
         }
-        return retLines;
+        return elements;
     }
     /**
      *

package/lib/classes/ovary.js

@@ -542,6 +542,7 @@ class Ovary {
         }
         let lackVmlinuzImage = false;
         if (fs_1.default.existsSync(this.settings.kernel_image)) {
+            console.log('kernel image:' + this.settings.kernel_image);
             await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, this.echo);
         }
         else {
@@ -561,7 +562,12 @@ class Ovary {
         let initrdImg = utils_2.default.initrdImg();
         initrdImg = initrdImg.substring(initrdImg.lastIndexOf('/') + 1);
         utils_2.default.warning(`Creating ${initrdImg} in ${this.settings.work_dir.pathIso}/live/`);
-        await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        if (this.settings.distro.distroId === 'ManjaroLinux') {
+            await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio-produce.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        }
+        else if (this.settings.distro.distroId === 'Arch') {
+            await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/archlinux/mkinitcpio-produce.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
+        }
     }
     /**
      * We must upgrade to initrdCreate for Debian/Ubuntu
@@ -632,12 +638,11 @@ class Ovary {
             //this.addRemoveExclusion(true, '/etc/localtime')
         }
         this.addRemoveExclusion(true, this.settings.config.snapshot_dir /* .absolutePath() */);
-        const compression = `-comp ${this.settings.config.compression}`;
         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`);
         }
-        // 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.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes} `;
+        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.config.snapshot_excludes} ${this.settings.session_excludes}`;
         cmd = cmd.replace(/\s\s+/g, ' ');
         utils_2.default.writeX(`${this.settings.work_dir.path}mksquashfs`, cmd);
         if (!scriptOnly) {