penguins-eggs 10.0.2 → 10.0.3

package/dist/krill/sequence.js

@@ -8,7 +8,7 @@
  */
 import Settings from '../classes/settings.js';
 import React from 'react';
-import { render } from 'ink';
+import { render, Box, Text } from 'ink';
 import Install from '../components/install.js';
 import Finished from '../components/finished.js';
 import fs from 'fs';
@@ -55,6 +55,8 @@ import umount from './modules/umount.js';
 import mkfs from './modules/mkfs.js';
 import hostname from './modules/hostname.js';
 import CFS from '../classes/cfs.js';
+import Title from '../components/title.js';
+import cliCursor from 'cli-cursor';
 /**
  * hatching: installazione o cova!!!
  */
@@ -127,6 +129,7 @@ export default class Sequence {
     is_crypted_clone = fs.existsSync('/etc/penguins-eggs.d/is_crypted_clone');
     unattended = false;
     nointeractive = false;
+    chroot = false;
     halt = false;
     cliAutologin = new CliAutologin();
     /**
@@ -159,7 +162,7 @@ export default class Sequence {
      * @param umount
      * @returns
      */
-    async start(domain = '', unattended = false, nointeractive = false, halt = false, verbose = false) {
+    async start(domain = '', unattended = false, nointeractive = false, chroot = false, halt = false, verbose = false) {
         // Imposta il domain per flag
         if (domain !== '') {
             if (domain.at(0) !== '.') {
@@ -180,6 +183,7 @@ export default class Sequence {
         }
         this.unattended = unattended;
         this.nointeractive = nointeractive;
+        this.chroot = chroot;
         this.halt = halt;
         this.verbose = verbose;
         this.echo = Utils.setEcho(this.verbose);
@@ -326,30 +330,10 @@ export default class Sequence {
             catch (error) {
                 await Utils.pressKeyToExit(JSON.stringify(error));
             }
-            // initramfsCfg
-            message = "initramfs configure";
-            percent = 0.67;
-            try {
-                await redraw(React.createElement(Install, { message: message, percent: percent }));
-                await this.initramfsCfg(this.partitions.installationDevice);
-            }
-            catch (error) {
-                await Utils.pressKeyToExit(JSON.stringify(error));
-            }
-            // initramfs
-            message = "initramfs ";
-            percent = 0.70;
-            try {
-                await redraw(React.createElement(Install, { message: message, percent: percent }));
-                await this.initramfs();
-            }
-            catch (error) {
-                await Utils.pressKeyToExit(JSON.stringify(error));
-            }
             // dpkg-unsafe-io-undo
             if (this.distro.familyId === 'debian') {
                 message = "dpkg-unsafe-io-undo";
-                percent = 0.72;
+                percent = 0.65;
                 try {
                     await redraw(React.createElement(Install, { message: message, percent: percent }));
                     await this.execCalamaresModule('dpkg-unsafe-io-undo');
@@ -370,7 +354,7 @@ export default class Sequence {
             if (!this.is_clone) {
                 // locale
                 message = "Locale";
-                percent = 0.74;
+                percent = 0.70;
                 try {
                     redraw(React.createElement(Install, { message: message, percent: percent }));
                     await this.locale();
@@ -380,7 +364,7 @@ export default class Sequence {
                 }
                 // keyboard
                 message = "settings keyboard";
-                percent = 0.75;
+                percent = 0.71;
                 try {
                     await this.keyboard();
                 }
@@ -389,7 +373,7 @@ export default class Sequence {
                 }
                 // localeCfg
                 message = "Locale Configuration";
-                percent = 0.76;
+                percent = 0.72;
                 try {
                     await this.localeCfg();
                     await exec("chroot " + this.installTarget + " locale-gen");
@@ -399,7 +383,7 @@ export default class Sequence {
                 }
                 // delLiveUser
                 message = "Remove user LIVE";
-                percent = 0.75;
+                percent = 0.73;
                 try {
                     await redraw(React.createElement(Install, { message: message, percent: percent }));
                     await this.delLiveUser();
@@ -409,7 +393,7 @@ export default class Sequence {
                 }
                 // addUser
                 message = "Add user";
-                percent = 0.76;
+                percent = 0.74;
                 try {
                     await redraw(React.createElement(Install, { message: message, percent: percent }));
                     await this.addUser(this.users.username, this.users.password, this.users.fullname, '', '', '');
@@ -419,7 +403,7 @@ export default class Sequence {
                 }
                 // changePassword root
                 message = "Add root password";
-                percent = 0.77;
+                percent = 0.75;
                 try {
                     await redraw(React.createElement(Install, { message: message, percent: percent }));
                     await this.changePassword('root', this.users.rootPassword);
@@ -431,7 +415,7 @@ export default class Sequence {
                 if (Pacman.isInstalledGui()) {
                     try {
                         message = "Autologin GUI";
-                        percent = 0.78;
+                        percent = 0.76;
                         if (this.users.autologin) {
                             await Xdg.autologin(await Utils.getPrimaryUser(), this.users.username, this.installTarget);
                             if (this.distro.distroLike === 'Arch') {
@@ -458,7 +442,7 @@ export default class Sequence {
             }
             // bootloader-config
             message = "bootloader-config ";
-            percent = 0.82;
+            percent = 0.81;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await this.bootloaderConfig();
@@ -468,7 +452,7 @@ export default class Sequence {
             }
             // grubcfg
             message = "grubcfg ";
-            percent = 0.84;
+            percent = 0.82;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await this.grubcfg();
@@ -478,7 +462,7 @@ export default class Sequence {
             }
             // bootloader (grub-install)
             message = "bootloader ";
-            percent = 0.86;
+            percent = 0.83;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await this.bootloader();
@@ -489,7 +473,7 @@ export default class Sequence {
             // sources-yolk-undo
             if (this.distro.familyId === 'debian') {
                 message = "sources-yolk-undo";
-                percent = 0.88;
+                percent = 0.84;
                 try {
                     await redraw(React.createElement(Install, { message: message, percent: percent }));
                     await this.execCalamaresModule('sources-yolk-undo');
@@ -499,21 +483,41 @@ export default class Sequence {
                 }
             }
             // packages
-            message = "add/remove packages";
-            percent = 0.90;
+            message = "add/remove same packages";
+            percent = 0.85;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await this.packages();
             }
             catch (error) {
-                console.log(JSON.stringify(error));
+                await Utils.pressKeyToExit(JSON.stringify(error));
+            }
+            // initramfsCfg
+            message = "initramfs configure";
+            percent = 0.86;
+            try {
+                await redraw(React.createElement(Install, { message: message, percent: percent }));
+                await this.initramfsCfg(this.partitions.installationDevice);
+            }
+            catch (error) {
+                await Utils.pressKeyToExit(JSON.stringify(error));
+            }
+            // initramfs
+            message = "initramfs ";
+            percent = 0.87;
+            try {
+                await redraw(React.createElement(Install, { message: message, percent: percent }));
+                await this.initramfs();
+            }
+            catch (error) {
+                await Utils.pressKeyToExit(JSON.stringify(error));
             }
             /**
              *
              * remove CLI/GUI installer link
              */
             message = "remove GUI installer link";
-            percent = 0.92;
+            percent = 0.88;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await this.removeInstallerLink();
@@ -523,7 +527,7 @@ export default class Sequence {
             }
             // remove /etc/penguins_eggs.d/is_clone*
             message = "Cleanup";
-            percent = 0.94;
+            percent = 0.89;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await exec(`rm -f ${this.installTarget}/etc/penguins-eggs.d/is_clone`);
@@ -540,7 +544,7 @@ export default class Sequence {
             if (steps.length > 0) {
                 for (const step of steps) {
                     message = `running ${step}`;
-                    percent = 0.97;
+                    percent = 0.90;
                     try {
                         await redraw(React.createElement(Install, { message: message, percent: percent }));
                         await this.execCalamaresModule(step);
@@ -550,6 +554,23 @@ export default class Sequence {
                     }
                 }
             }
+            // chroot
+            if (chroot) {
+                message = `You are in chroot mode under ${this.installTarget}, type "exit" to exit.`;
+                percent = 0.95;
+                try {
+                    await redraw(React.createElement(React.Fragment, null,
+                        React.createElement(Title, null),
+                        React.createElement(Box, null,
+                            React.createElement(Text, null, message))));
+                    cliCursor.show();
+                    await exec(`chroot ${this.installTarget} /bin/bash`);
+                    cliCursor.hide();
+                }
+                catch (error) {
+                    await Utils.pressKeyToExit(JSON.stringify(error));
+                }
+            }
             // umountVfs
             message = "umount VFS";
             percent = 0.96;
@@ -561,7 +582,7 @@ export default class Sequence {
                 await Utils.pressKeyToExit(JSON.stringify(error));
             }
             message = "umount";
-            percent = 0.98;
+            percent = 0.97;
             try {
                 await redraw(React.createElement(Install, { message: message, percent: percent }));
                 await this.umountFs();
@@ -625,7 +646,6 @@ async function redraw(elem) {
     opt.patchConsole = false;
     opt.debug = false;
     console.clear();
-    // await exec('clear', Utils.setEcho(false))
     render(elem, opt);
 }
 /**

package/dist/lib/cli-autologin.js

@@ -113,7 +113,7 @@ export default class CliAutologin {
         eggsMotd += 'You are logged as: ' + chalk.bold(user) + ' your password is: ' + chalk.bold(userPasswd) + ', root password: ' + chalk.bold(rootPasswd) + '\n\n';
         eggsMotd += 'install              : ' + chalk.bold(installer) + '\n';
         eggsMotd += '  unattended         : ' + chalk.bold('sudo eggs install --unattended  # us configuration') + '\n';
-        eggsMotd += '  unattended custom  : ' + chalk.bold('sudo eggs install --custom [ br | it | yours ]') + '\n';
+        eggsMotd += '  chroot             : ' + chalk.bold('sudo eggs install --chroot # chroot on installed before to end') + '\n';
         eggsMotd += 'PXE server           : ' + chalk.bold('sudo eggs cuckoo') + '\n';
         eggsMotd += '(*) to get your custom unattended configuration: fork https://github.com/pieroproietti/penguins-wardrobe' + '\n';
         eggsMotd += '    create your configuration in /config and ask for a Pull Request' + '\n';

package/manpages/doc/man/eggs.html

@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
   <body>
-    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.2</h1>
+    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.3</h1>
     <h1>SYNOPSIS</h1>
     <p>Install Debian families (debian/devuan/ubuntu)</p>
-    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.2-1_i386.deb
+    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.3-1_i386.deb
 </code></pre>
     <p>Install Arch families (Arch, manjaro Linux)</p>
     <p>Arch from AUR</p>
@@ -30,7 +30,7 @@ $ makepkg -si
     <h1>USAGE</h1>
     <pre><code>$ eggs (-v|--version|version)
 
-penguins-eggs/10.0.2  
+penguins-eggs/10.0.3  
 $ eggs --help [COMMAND]
 
 USAGE
@@ -280,14 +280,14 @@ DESCRIPTION
     <h2><code>eggs install</code></h2>
     <p>krill: the CLI system installer - the egg became a penguin!</p>
     <pre><code>USAGE
-  $ eggs install [-b] [-k] [-c &#x3C;value>] [-d &#x3C;value>] [-H] [-h] [-i] [-n] [-N] [-p] [-r] [-s] [-S] [-u] [-v]
+  $ eggs install [-b] [-k] [-c] [-d &#x3C;value>] [-H] [-h] [-i] [-n] [-N] [-p] [-r] [-s] [-S] [-u] [-v]
 
 FLAGS
   -H, --halt            Halt the system after installation
   -N, --none            Swap none: 256M
   -S, --suspend         Swap suspend: RAM x 2
   -b, --btrfs           Format btrfs
-  -c, --custom=&#x3C;value>  custom unattended configuration
+  -c, --chroot          chroot before to end
   -d, --domain=&#x3C;value>  Domain name, defult: .local
   -h, --help            Show CLI help.
   -i, --ip              hostname as ip, eg: ip-192-168-1-33
@@ -310,7 +310,7 @@ EXAMPLES
 
   sudo eggs install --unattended --halt
 
-  sudo eggs install --custom it
+  sudo eggs install --chroot
 </code></pre>
     <h2><code>eggs kill</code></h2>
     <p>kill the eggs/free the nest</p>
@@ -332,14 +332,14 @@ EXAMPLES
     <h2><code>eggs krill</code></h2>
     <p>krill: the CLI system installer - the egg became a penguin!</p>
     <pre><code>USAGE
-  $ eggs krill [-b] [-k] [-c &#x3C;value>] [-d &#x3C;value>] [-H] [-h] [-i] [-n] [-N] [-p] [-r] [-s] [-S] [-u] [-v]
+  $ eggs krill [-b] [-k] [-c] [-d &#x3C;value>] [-H] [-h] [-i] [-n] [-N] [-p] [-r] [-s] [-S] [-u] [-v]
 
 FLAGS
   -H, --halt            Halt the system after installation
   -N, --none            Swap none: 256M
   -S, --suspend         Swap suspend: RAM x 2
   -b, --btrfs           Format btrfs
-  -c, --custom=&#x3C;value>  custom unattended configuration
+  -c, --chroot          chroot before to end
   -d, --domain=&#x3C;value>  Domain name, defult: .local
   -h, --help            Show CLI help.
   -i, --ip              hostname as ip, eg: ip-192-168-1-33
@@ -362,7 +362,7 @@ EXAMPLES
 
   sudo eggs install --unattended --halt
 
-  sudo eggs install --custom it
+  sudo eggs install --chroot
 </code></pre>
     <h2><code>eggs mom</code></h2>
     <p>ask help from mommy - TUI helper</p>

package/package.json

@@ -2,19 +2,20 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "10.0.2",
+  "version": "10.0.3",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
   },
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
-    "@oclif/core": "^3",
-    "@oclif/plugin-autocomplete": "^3.1.0",
+    "@oclif/core": "^4.0.1",
+    "@oclif/plugin-autocomplete": "^3.1.2",
     "@oclif/plugin-help": "^6.1.0",
-    "@oclif/plugin-version": "^2.2.0",
+    "@oclif/plugin-version": "^2.2.2",
     "axios": "^1.7.2",
     "chalk": "^5.3.0",
+    "cli-cursor": "^4.0.0",
     "etrick": "0.0.3",
     "ink": "^5.0.0",
     "inquirer": "^9.2.23",
@@ -36,7 +37,7 @@
     "@types/mocha": "^10",
     "@types/mustache": "^4.2.5",
     "@types/netmask": "^2.0.5",
-    "@types/node": "^18",
+    "@types/node": "^20.14.2",
     "@types/node-static": "^0.7.11",
     "@types/react": "^18.3.3",
     "@types/shelljs": "^0.8.15",
@@ -46,8 +47,8 @@
     "eslint-config-oclif-typescript": "^3",
     "eslint-config-prettier": "^9",
     "mocha": "^10",
-    "perrisbrewery": "../perrisbrewery",
-    "oclif": "^4.12.0",
+    "oclif": "^4.13.0",
+    "perrisbrewery": "^9.8.3",
     "shx": "^0.3.3",
     "ts-node": "^10",
     "typescript": "^5"
@@ -97,7 +98,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "shx rm -rf dist && tsc -b",
-    "deb": "tsc -p . && pb deb",
+    "deb": "tsc -p . && oclif manifest && pb deb",
     "lint": "eslint . --ext .ts",
     "manifest": "oclif manifest",
     "posttest": "pnpm run lint",