penguins-eggs 10.0.30 → 10.0.32

package/dist/krill/sequence.js

@@ -13,12 +13,12 @@ import Install from '../components/install.js';
 import Finished from '../components/finished.js';
 import fs from 'fs';
 import yaml from 'js-yaml';
-import Utils from '../classes/utils.js';
+import { installer } from '../classes/incubation/installer.js';
 import CliAutologin from '../classes/cli-autologin.js';
+import Distro from '../classes/distro.js';
 import Pacman from '../classes/pacman.js';
-import { installer } from '../classes/incubation/installer.js';
+import Utils from '../classes/utils.js';
 import Xdg from '../classes/xdg.js';
-import Distro from '../classes/distro.js';
 import { exec } from '../lib/utils.js';
 // import krill modules
 import partition from './modules/partition.js';
@@ -39,9 +39,6 @@ import networkCfg from './modules/network-cfg.js';
 // services-systemd:
 // bootloader-config
 import bootloaderConfig from './modules/bootloader-config.js';
-import bootloaderConfigAlpine from './modules/bootloader-config-alpine.js';
-import bootloaderConfigArch from './modules/bootloader-config-arch.js';
-import bootloaderConfigDebian from './modules/bootloader-config-debian.js';
 import grubcfg from './modules/grubcfg.js';
 import bootloader from './modules/bootloader.js';
 import packages from './modules/packages.js';
@@ -51,13 +48,13 @@ import initramfs from './modules/initramfs.js';
 import delLiveUser from './modules/del-live-user.js';
 // umount already imported
 // to order in same wat
-import mTimezone from './modules/m-timezone.js';
 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';
+import { spawnSync } from 'child_process';
 /**
  * hatching: installazione o cova!!!
  */
@@ -82,9 +79,6 @@ export default class Sequence {
     // services-systemd:
     // bootloader-config
     bootloaderConfig = bootloaderConfig;
-    bootloaderConfigAlpine = bootloaderConfigAlpine;
-    bootloaderConfigArch = bootloaderConfigArch;
-    bootloaderConfigDebian = bootloaderConfigDebian;
     //
     grubcfg = grubcfg;
     bootloader = bootloader;
@@ -98,7 +92,6 @@ export default class Sequence {
     umountFs = umountFs;
     umountVfs = umountVfs;
     // to order in same way
-    timezone = mTimezone;
     umount = umount;
     mkfs = mkfs;
     hostname = hostname;
@@ -154,7 +147,6 @@ export default class Sequence {
         this.devices.root = {};
         this.devices.data = {};
         this.devices.swap = {};
-        //this.distro = new Distro(this.remix)
         this.distro = new Distro();
         this.efi = fs.existsSync('/sys/firmware/efi/efivars');
         this.luksFile = `${this.distro.liveMediumPath}live/${this.luksName}`;
@@ -356,17 +348,15 @@ export default class Sequence {
              * - autologin
              */
             if (!this.is_clone) {
-                if (this.distro.familyId !== 'alpine') {
-                    // locale
-                    message = "Locale";
-                    percent = 0.70;
-                    try {
-                        redraw(React.createElement(Install, { message: message, percent: percent }));
-                        await this.locale();
-                    }
-                    catch (error) {
-                        await Utils.pressKeyToExit(JSON.stringify(error));
-                    }
+                // locale
+                message = "Locale";
+                percent = 0.70;
+                try {
+                    redraw(React.createElement(Install, { message: message, percent: percent }));
+                    await this.locale();
+                }
+                catch (error) {
+                    await Utils.pressKeyToExit(JSON.stringify(error));
                 }
                 // keyboard
                 message = "settings keyboard";
@@ -628,23 +618,25 @@ export default class Sequence {
      * only show the result
      */
     async finished() {
-        await redraw(React.createElement(Finished, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.username }));
         let cmd = "reboot";
         if (this.halt) {
             cmd = "poweroff";
         }
+        let message = `Press a key to ${cmd}`;
+        if (this.unattended && this.nointeractive) {
+            message = `System will ${cmd} in 5 seconds...`;
+        }
+        await redraw(React.createElement(Finished, { installationDevice: this.partitions.installationDevice, hostName: this.users.hostname, userName: this.users.username }));
         if (this.unattended && this.nointeractive) {
-            console.log(`System will ${cmd} in 5 seconds...`);
             await sleep(5000);
-            await exec(cmd, { echo: true });
+            await exec(cmd, { echo: false });
         }
         else {
-            Utils.pressKeyToExit(`Press a key to ${cmd}`);
-            await exec(cmd, { echo: true });
+            spawnSync('read _ ', { shell: true, stdio: [0, 1, 2] });
+            await exec(cmd, { echo: false });
         }
     }
 }
-// const ifaces: string[] = fs.readdirSync('/sys/class/net/')
 /**
  *
  * @param elem

package/dist/lib/select_filesystem_type.js

@@ -17,13 +17,14 @@ export default async function selectFileSystemType() {
     else {
         partitions.defaultFileSystemType = 'ext4';
     }
-    partitions.defaultFileSystemType = 'ext4';
+    const choices = ['ext4'];
     if (Pacman.packageIsInstalled('btrfs-progs')) {
-        partitions.defaultFileSystemType = 'btrfs';
+        choices.push('btrfs');
     }
+    partitions.defaultFileSystemType = 'ext4';
     const questions = [
         {
-            choices: ['btrfs', 'ext4'],
+            choices: choices,
             default: partitions.defaultFileSystemType,
             message: 'Select file system tyèe',
             name: 'fileSystemChoices',

package/manpages/doc/man/eggs.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
   <body>
-    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.30</h1>
+    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.32</h1>
     <h1>SYNOPSIS</h1>
     <p>eggs is a console utility, in active development, who let you to remaster your system and redistribuite it as live ISO image.</p>
     <h1>INSTALL</h1>
@@ -15,11 +15,11 @@
 </code></pre>
     <p>Arch</p>
     <pre><code>$ sudo pacman -S penguins-eggs
-$ sudo pacman -U penguins-eggs_10.0.30-bionic-1_amd64-1-x86_64.pkg.tar.zst
+$ sudo pacman -U penguins-eggs_10.0.32-bionic-1_amd64-1-x86_64.pkg.tar.zst
 </code></pre>
     <p>Debian/Devuan/Ubuntu</p>
     <pre><code>$ sudo apt install penguins-eggs
-$ sudo dpkg -i penguins-eggs_10.0.30-bionic-1_amd64.deb
+$ sudo dpkg -i penguins-eggs_10.0.32-bionic-1_amd64.deb
 </code></pre>
     <p>Manjaro</p>
     <pre><code>$ sudo pamac install penguins-eggs
@@ -27,7 +27,7 @@ $ sudo dpkg -i penguins-eggs_10.0.30-bionic-1_amd64.deb
     <h1>USAGE</h1>
     <pre><code>$ eggs (-v|--version|version)
 
-penguins-eggs/10.0.30  
+penguins-eggs/10.0.32  
 $ eggs --help [COMMAND]
 
 USAGE

package/package.json

@@ -2,22 +2,24 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "10.0.30",
+  "version": "10.0.32",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
   },
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
-    "@oclif/core": "^4.0.18",
-    "@oclif/plugin-autocomplete": "^3.1.11",
-    "@oclif/plugin-help": "^6.2.8",
-    "@oclif/plugin-version": "^2.2.10",
-    "axios": "^1.7.4",
+    "@oclif/core": "^4.0.19",
+    "@oclif/plugin-autocomplete": "^3.2.2",
+    "@oclif/plugin-help": "^6.2.10",
+    "@oclif/plugin-version": "^2.2.11",
+    "ansis": "^3.3.2",
+    "axios": "^1.7.5",
     "chalk": "^5.3.0",
     "cli-cursor": "^4.0.0",
+    "debug": "^4.3.6",
     "ink": "^5.0.1",
-    "inquirer": "^9.2.23",
+    "inquirer": "^9.3.6",
     "js-yaml": "^4.1.0",
     "mustache": "^4.2.0",
     "netmask": "^2.0.2",
@@ -25,19 +27,20 @@
     "node-static": "^0.7.11",
     "react": "^18.3.1",
     "shelljs": "^0.8.5",
-    "systeminformation": "^5.23.4",
+    "systeminformation": "^5.23.5",
     "tftp": "^0.1.2"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^4.0.8",
-    "@types/chai": "^4.3.17",
+    "@oclif/test": "^4.0.9",
+    "@types/chai": "^4.3.18",
+    "@types/debug": "^4.1.12",
     "@types/inquirer": "^9.0.7",
     "@types/js-yaml": "^4.0.9",
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.7",
     "@types/mustache": "^4.2.5",
     "@types/netmask": "^2.0.5",
-    "@types/node": "^20.14.12",
+    "@types/node": "^20.16.1",
     "@types/node-static": "^0.7.11",
     "@types/react": "^18.3.4",
     "@types/shelljs": "^0.8.15",
@@ -46,8 +49,8 @@
     "eslint-config-oclif": "^5.2.1",
     "eslint-config-oclif-typescript": "^3.1.9",
     "eslint-config-prettier": "^9.1.0",
-    "mocha": "^10.6.0",
-    "oclif": "^4.14.22",
+    "mocha": "^10.7.3",
+    "oclif": "^4.14.26",
     "perrisbrewery": "^10.0.1",
     "prettier": "^3.3.3",
     "shx": "^0.3.4",

package/dist/krill/modules/bootloader-config-alpine.d.ts

@@ -1,14 +0,0 @@
-/**
- * ./src/krill/modules/add-user.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Sequence from '../sequence.js';
-/**
- *
- * @param this
- */
-export default function bootloaderConfigAlpine(this: Sequence): Promise<void>;

package/dist/krill/modules/bootloader-config-alpine.js

@@ -1,37 +0,0 @@
-/**
- * ./src/krill/modules/add-user.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Utils from '../../classes/utils.js';
-import { exec } from '../../lib/utils.js';
-/**
- *
- * @param this
- */
-export default async function bootloaderConfigAlpine() {
-    let cmd = '';
-    if (this.efi) {
-        try {
-            cmd = `chroot ${this.installTarget} apk add grub grub-efi efibootmgr} ${this.toNull}`;
-            await exec(cmd, this.echo);
-        }
-        catch (error) {
-            console.log(error);
-            await Utils.pressKeyToExit(cmd, true);
-        }
-    }
-    else {
-        try {
-            cmd = `chroot ${this.installTarget} apk add grub grub-bios ${this.toNull}`;
-            await exec(cmd, this.echo);
-        }
-        catch (error) {
-            console.log(error);
-            await Utils.pressKeyToExit(cmd, true);
-        }
-    }
-}

package/dist/krill/modules/bootloader-config-arch.d.ts

@@ -1,14 +0,0 @@
-/**
- * ./src/krill/modules/add-user.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Sequence from '../sequence.js';
-/**
- *
- * @param this
- */
-export default function bootloaderConfigArch(this: Sequence): Promise<void>;

package/dist/krill/modules/bootloader-config-arch.js

@@ -1,37 +0,0 @@
-/**
- * ./src/krill/modules/add-user.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Utils from '../../classes/utils.js';
-import { exec } from '../../lib/utils.js';
-/**
- *
- * @param this
- */
-export default async function bootloaderConfigArch() {
-    let cmd = '';
-    if (this.efi) {
-        try {
-            cmd = `chroot ${this.installTarget} pacman -Sy grub efibootmgr} ${this.toNull}`;
-            await exec(cmd, this.echo);
-        }
-        catch (error) {
-            console.log(error);
-            await Utils.pressKeyToExit(cmd, true);
-        }
-    }
-    else {
-        try {
-            cmd = `chroot ${this.installTarget} pacman -Sy grub ${this.toNull}`;
-            await exec(cmd, this.echo);
-        }
-        catch (error) {
-            console.log(error);
-            await Utils.pressKeyToExit(cmd, true);
-        }
-    }
-}

package/dist/krill/modules/bootloader-config-debian.d.ts

@@ -1,10 +0,0 @@
-/**
- * ./src/krill/modules/bootloader-config-debian.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Sequence from '../sequence.js';
-export default function bootloaderConfigDebian(this: Sequence): Promise<void>;

package/dist/krill/modules/bootloader-config-debian.js

@@ -1,50 +0,0 @@
-/**
- * ./src/krill/modules/bootloader-config-debian.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Utils from '../../classes/utils.js';
-import { exec } from '../../lib/utils.js';
-export default async function bootloaderConfigDebian() {
-    let cmd = '';
-    try {
-        cmd = `chroot ${this.installTarget} apt-get update -y ${this.toNull}`;
-        await exec(cmd, this.echo);
-    }
-    catch (error) {
-        console.log(error);
-        await Utils.pressKeyToExit(cmd, true);
-    }
-    try {
-        cmd = `chroot ${this.installTarget} sleep 1 ${this.toNull}`;
-        await exec(cmd, this.echo);
-    }
-    catch (error) {
-        console.log(error);
-        await Utils.pressKeyToExit(cmd, true);
-    }
-    const aptInstallOptions = ' apt install -y --no-upgrade --allow-unauthenticated -o Acquire::gpgv::Options::=--ignore-time-conflict ';
-    if (this.efi) {
-        try {
-            cmd = `chroot ${this.installTarget} ${aptInstallOptions} grub-efi-${Utils.uefiArch()} --allow-unauthenticated ${this.toNull}`;
-            await exec(cmd, this.echo);
-        }
-        catch (error) {
-            console.log(error);
-            await Utils.pressKeyToExit(cmd, true);
-        }
-    }
-    else {
-        try {
-            cmd = `chroot ${this.installTarget} ${aptInstallOptions} grub-pc ${this.toNull}`;
-            await exec(cmd, this.echo);
-        }
-        catch (error) {
-            console.log(error);
-            await Utils.pressKeyToExit(cmd, true);
-        }
-    }
-}

package/dist/krill/modules/m-timezone.d.ts

@@ -1,14 +0,0 @@
-/**
- * ./src/krill/modules/m-timezone.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import Sequence from '../sequence.js';
-/**
- *
- * @param this
- */
-export default function mTimezone(this: Sequence): Promise<void>;

package/dist/krill/modules/m-timezone.js

@@ -1,22 +0,0 @@
-/**
- * ./src/krill/modules/m-timezone.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
- */
-import fs from 'node:fs';
-import { exec } from '../../lib/utils.js';
-/**
- *
- * @param this
- */
-export default async function mTimezone() {
-    if (fs.existsSync('/etc/localtime')) {
-        const cmd = `chroot ${this.installTarget} unlink /etc/localtime`;
-        await exec(cmd, this.echo);
-    }
-    const cmd = `chroot ${this.installTarget} ln -sf /usr/share/zoneinfo/${this.region}/${this.zone} /etc/localtime`;
-    await exec(cmd, this.echo);
-}

package/mkinitfs/machine-id-gen.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-MACHINE_ID=$(uuidgen)
-echo "$MACHINE_ID" | tee /etc/machine-id

package/mkinitfs/sidecar.sh

@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-# At the end of the boot, initram goes into emergency,
-# we give the following commands:
-# mkdir /mnt
-# mount /dev/sr0 /mnt
-# /mnt/live/sidecar.sh
-#  
-
-DIRECTORY="/sysroot"
-if [ -z "$(find "$DIRECTORY" -mindepth 1)" ]; then
-	echo "sidecar: /sysroot is again emply!"
-	echo "         type 'exit' to return init, then run sidecar.sh again"
-	exit 0
-fi
-
-# Creating mountpoints
-mkdir -p /media/root-ro 
-mkdir -p /media/root-rw 
-
-# mount filesystem squashfs on /media/root-ro
-mount -t squashfs /mnt/live/filesystem.squashfs /media/root-ro
-
-# Mount tmpfs on /media/root-rw
-mount -t tmpfs root-tmpfs /media/root-rw
-
-# Creare i punti di montaggio necessari
-mkdir -p /media/root-rw/work 
-mkdir -p /media/root-rw/root
-
-# mount  overlayfs on //sysroot
-mount -t overlay overlay -o lowerdir=/media/root-ro,upperdir=/media/root-rw/root,workdir=/media/root-rw/work /sysroot
-
-# insert a dummy value for /etc/machine-id
-echo "9350a55456f5bb96ef2fda0166a86d91" | tee /sysroot/etc/machine-id
-
-echo "sidecar: /sysroot was mounted!"
-echo "         ================================"
-echo "         YOU CAN TYPE 'exit' TO BOOT LIVE"
-echo "         ================================"