penguins-eggs 25.11.29 → 25.12.7

package/dist/classes/utils.d.ts

@@ -62,7 +62,7 @@ export default class Utils {
      */
     static isOpenRc(): boolean;
     /**
-     * Occore vedere un modo per creare machine-id dove non esiste
+     * Usata da pacman e config credo non serva affatto
      */
     static machineId(): string;
     /**
@@ -153,11 +153,10 @@ export default class Utils {
      */
     static getUsedSpace(): number;
     /**
-     * Extimate the linuxfs dimension
-     * probably is better to rename it as
-     * getLiveSpaceRootNeed
-     * @returns {number} Byte
-     */
+    * Estimate the linuxfs dimension
+    * (Refactored to use native FS instead of dd/od)
+    * @returns {number} GB
+    */
     static getLiveRootSpace(type?: string): number;
     /**
      * Return true if i686 architecture
@@ -327,4 +326,14 @@ export default class Utils {
     static wardrobe(): Promise<string>;
     static getOsRelease(): IOsRelease;
     static sleep(ms?: number): Promise<void>;
+    /**
+     * chpasswdPath
+     * @returns
+     */
+    static chpasswdPath(): string;
+    /**
+     *
+     * @param cmd
+     */
+    static commandExists(cmd: string): boolean;
 }

package/dist/classes/utils.js

@@ -7,13 +7,12 @@
  *
  * Refactored Utils class - imports from modular utilities
  */
-import shx from 'shelljs';
+import { shx, spawnSync } from '../lib/utils.js';
 import fs from 'fs';
 import dns from 'dns';
 import path from 'path';
 import os from 'os';
 import inquirer from 'inquirer';
-import { execSync, spawnSync } from 'child_process';
 import chalk from 'chalk';
 import Kernel from './utils.d/kernel.js';
 // libraries
@@ -155,18 +154,12 @@ export default class Utils {
     static isOpenRc() {
         let isOpenRc = false;
         if (!this.isContainer()) {
-            try {
-                execSync('command -v openrc');
-                isOpenRc = true;
-            }
-            catch (error) {
-                isOpenRc = false;
-            }
+            isOpenRc = Utils.commandExists('openrc');
         }
         return isOpenRc;
     }
     /**
-     * Occore vedere un modo per creare machine-id dove non esiste
+     * Usata da pacman e config credo non serva affatto
      */
     static machineId() {
         let result = '';
@@ -436,49 +429,71 @@ export default class Utils {
         return fileSizeInBytes;
     }
     /**
-     * Extimate the linuxfs dimension
-     * probably is better to rename it as
-     * getLiveSpaceRootNeed
-     * @returns {number} Byte
-     */
+    * Estimate the linuxfs dimension
+    * (Refactored to use native FS instead of dd/od)
+    * @returns {number} GB
+    */
     static getLiveRootSpace(type = 'debian-live') {
         let squashFs = '/run/live/medium/live/filesystem.squashfs';
         if (type === 'mx') {
             squashFs = '/live/boot-dev/antiX/linuxfs';
         }
-        // Ottengo la dimensione del file compresso
-        const compressedFs = fs.statSync(squashFs).size;
-        // get compression factor by reading the linuxfs squasfs file, if available
-        const compressedFs_compression_type = shx.exec(`dd if=${compressedFs} bs=1 skip=20 count=2 status=none 2>/dev/null| /usr/bin/od -An -tdI`);
-        let compression_factor = 0;
-        if (compressedFs_compression_type === '1') {
-            compression_factor = 37; // gzip
-        }
-        else if (compressedFs_compression_type === '2') {
-            compression_factor = 52; // lzo, not used by antiX
-        }
-        else if (compressedFs_compression_type === '3') {
-            compression_factor = 52; // lzma, not used by antiX
-        }
-        else if (compressedFs_compression_type === '4') {
-            compression_factor = 31; // xz
-        }
-        else if (compressedFs_compression_type === '5') {
-            compression_factor = 52; // lz4
-        }
-        else {
-            compression_factor = 30; // anything else or linuxfs not reachable (toram), should be pretty conservative
+        // 1. Leggiamo il tipo di compressione DIRETTAMENTE dall'header del file SquashFS
+        // L'identificativo della compressione è a offset 20 (2 bytes, little endian)
+        // 1=gzip, 2=lzo, 3=lzma, 4=xz, 5=lz4, 6=zstd
+        let compressionId = 0;
+        try {
+            if (fs.existsSync(squashFs)) {
+                const fd = fs.openSync(squashFs, 'r');
+                const buffer = Buffer.alloc(2);
+                // Leggi 2 byte alla posizione 20
+                fs.readSync(fd, buffer, 0, 2, 20);
+                fs.closeSync(fd);
+                compressionId = buffer.readUInt16LE(0);
+            }
         }
+        catch (e) {
+            console.error("Error reading squashfs header:", e);
+        }
+        // 2. Determiniamo il fattore di compressione in base all'ID letto
+        let compression_factor = 30; // Default conservative
+        switch (compressionId) {
+            case 1: // gzip
+                compression_factor = 37;
+                break;
+            case 2: // lzo
+                compression_factor = 52;
+                break;
+            case 3: // lzma
+                compression_factor = 52;
+                break;
+            case 4: // xz
+                compression_factor = 31;
+                break;
+            case 5: // lz4
+                compression_factor = 52;
+                break;
+            case 6: // zstd (aggiunto per completezza)
+                compression_factor = 37; // simile a gzip come ratio medio
+                break;
+            default:
+                compression_factor = 30;
+        }
+        // 3. Calcolo dimensione Linux FS
+        // Nota: shx.exec ritorna un oggetto, dobbiamo prendere .stdout e pulirlo
         let rootfs_file_size = 0;
-        const linuxfs_file_size = (Number(shx.exec('df /live/linux --output=used --total | /usr/bin/tail -n1').stdout.trim()) * 1024 * 100) / compression_factor;
+        const dfCmdLinux = 'df /live/linux --output=used --total | /usr/bin/tail -n1';
+        const dfResultLinux = shx.exec(dfCmdLinux, { silent: true }).stdout.trim();
+        const linuxfs_used = Number(dfResultLinux) || 0; // Gestione caso NaN
+        const linuxfs_file_size = (linuxfs_used * 1024 * 100) / compression_factor;
+        // 4. Calcolo persist-root (se esiste)
         if (fs.existsSync('/live/persist-root')) {
-            rootfs_file_size = Number(shx.exec('df /live/persist-root --output=used --total | /usr/bin/tail -n1').stdout.trim()) * 1024;
+            const dfCmdRoot = 'df /live/persist-root --output=used --total | /usr/bin/tail -n1';
+            const dfResultRoot = shx.exec(dfCmdRoot, { silent: true }).stdout.trim();
+            rootfs_file_size = (Number(dfResultRoot) || 0) * 1024;
         }
         let rootSpaceNeeded;
         if (type === 'mx') {
-            /**
-             * add rootfs file size to the calculated linuxfs file size. Probaby conservative, as rootfs will likely have some overlap with linuxfs
-             */
             rootSpaceNeeded = linuxfs_file_size + rootfs_file_size;
         }
         else {
@@ -845,7 +860,7 @@ export default class Utils {
             msg = 'Press a key to continue...';
         }
         console.log(msg);
-        const pressKeyToExit = spawnSync('read _ ', { shell: true, stdio: [0, 1, 2] });
+        const pressKeyToExit = spawnSync('read _ ', [], { shell: true, stdio: [0, 1, 2] });
         if (!procContinue) {
             process.exit(0);
         }
@@ -857,7 +872,7 @@ export default class Utils {
             msg = 'Press a key to continue...';
         }
         console.log(msg);
-        const pressKeyToExit = spawnSync('read _ ', { shell: true, stdio: [0, 1, 2] });
+        const pressKeyToExit = spawnSync('read _ ', [], { shell: true, stdio: [0, 1, 2] });
         if (!procContinue) {
             process.exit(0);
         }
@@ -881,12 +896,12 @@ export default class Utils {
     static flag() {
         let type = '';
         if (!Utils.isAppImage()) {
-            type = 'native';
+            type = ' native';
         }
         let title = `${pjson.name}`;
         let green = ` ${title}`.padEnd(25, " ");
         let white = ` Perri's brewery edition `.padEnd(25, " ");
-        let red = ` v${pjson.version} ${type} `.padStart(25, " ");
+        let red = ` v${pjson.version}${type} `.padStart(25, " ");
         return chalk.bgGreen.whiteBright(green) +
             chalk.bgWhite.blue(white) +
             chalk.bgRed.whiteBright(red);
@@ -984,4 +999,22 @@ export default class Utils {
         // console.log('wait...')
         return new Promise(resolve => setTimeout(resolve, ms));
     }
+    /**
+     * chpasswdPath
+     * @returns
+     */
+    static chpasswdPath() {
+        let chpasswdPath = '/usr/sbin/chpasswd';
+        if (fs.existsSync(chpasswdPath)) {
+            chpasswdPath = '/usr/bin/chpasswd';
+        }
+        return chpasswdPath;
+    }
+    /**
+     *
+     * @param cmd
+     */
+    static commandExists(cmd) {
+        return !!shx.which(cmd);
+    }
 }

package/dist/classes/xdg.js

@@ -7,7 +7,7 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import shx from 'shelljs';
+import { shx } from '../lib/utils.js';
 // libraries
 import { exec } from '../lib/utils.js';
 import Distro from './distro.js';

package/dist/classes/yolk.js

@@ -7,10 +7,8 @@
  */
 import yaml from 'js-yaml';
 import fs from 'node:fs';
-import shx from 'shelljs';
-import { exec } from '../lib/utils.js';
+import { shx, exec } from '../lib/utils.js';
 import Bleach from './bleach.js';
-import Pacman from './pacman.js';
 import Utils from './utils.js';
 /**
  *
@@ -31,7 +29,7 @@ export default class Yolk {
         }
         Utils.warning(`Creating yolk on ${this.yolkDir}`);
         Utils.warning('Updating system');
-        if (!Pacman.commandIsInstalled('dpkg-scanpackages')) {
+        if (!Utils.commandExists('dpkg-scanpackages')) {
             Utils.warning(`I cannot find the command dpkg-scanpackages`);
             process.exit(0);
         }

package/dist/commands/export/appimage.js

@@ -10,7 +10,7 @@ import Tools from '../../classes/tools.js';
 import Utils from '../../classes/utils.js';
 import { exec } from '../../lib/utils.js';
 import os from 'node:os';
-import { execSync } from 'node:child_process';
+import { execSync } from '../../lib/utils.js';
 export default class ExportAppimage extends Command {
     static description = 'export penguins-eggs AppImage to the destination host';
     static examples = ['eggs export pkg', 'eggs export pkg --clean', 'eggs export pkg --all'];
@@ -34,9 +34,9 @@ export default class ExportAppimage extends Command {
         // Ora servono in più parti
         this.user = os.userInfo().username;
         if (this.user === 'root') {
-            this.user = execSync('echo $SUDO_USER', { encoding: 'utf-8' }).trim();
+            this.user = (execSync('echo $DOAS_USER') || '').trim();
             if (this.user === '') {
-                this.user = execSync('echo $DOAS_USER', { encoding: 'utf-8' }).trim();
+                this.user = (execSync('echo $DOAS_USER') || '').trim();
             }
         }
         this.clean = flags.clean;

package/dist/commands/export/pkg.js

@@ -12,7 +12,7 @@ import Tools from '../../classes/tools.js';
 import Utils from '../../classes/utils.js';
 import { exec } from '../../lib/utils.js';
 import os from 'node:os';
-import { execSync } from 'node:child_process';
+import { execSync } from '../../lib/utils.js';
 export default class ExportPkg extends Command {
     static description = 'export penguins-eggs package to the destination host';
     static examples = ['eggs export pkg', 'eggs export pkg --clean', 'eggs export pkg --all'];
@@ -38,9 +38,9 @@ export default class ExportPkg extends Command {
         // Ora servono in più parti
         this.user = os.userInfo().username;
         if (this.user === 'root') {
-            this.user = execSync('echo $SUDO_USER', { encoding: 'utf-8' }).trim();
+            this.user = (execSync('echo $DOAS_USER') || '').trim();
             if (this.user === '') {
-                this.user = execSync('echo $DOAS_USER', { encoding: 'utf-8' }).trim();
+                this.user = (execSync('echo $DOAS_USER') || '').trim();
             }
         }
         this.all = flags.all;

package/dist/commands/export/tarballs.js

@@ -16,7 +16,7 @@ import path from 'path';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 const pjson = require('../../../package.json');
-import { execSync } from 'node:child_process';
+import { execSync } from '../../lib/utils.js';
 export default class ExportTarballs extends Command {
     static description = 'export pkg/iso/tarballs to the destination host';
     static examples = ['eggs export tarballs', 'eggs export tarballs --clean'];
@@ -40,9 +40,9 @@ export default class ExportTarballs extends Command {
         // Ora servono in più parti
         this.user = os.userInfo().username;
         if (this.user === 'root') {
-            this.user = execSync('echo $SUDO_USER', { encoding: 'utf-8' }).trim();
+            this.user = (execSync('echo $DOAS_USER') || '').trim();
             if (this.user === '') {
-                this.user = execSync('echo $DOAS_USER', { encoding: 'utf-8' }).trim();
+                this.user = (execSync('echo $DOAS_USER') || '').trim();
             }
         }
         this.clean = flags.clean;

package/dist/commands/krill.js

@@ -9,7 +9,7 @@ import { Command, Flags } from '@oclif/core';
 import yaml from 'js-yaml';
 import fs from 'node:fs';
 import https from 'node:https';
-import shx from 'shelljs';
+import { shx } from '../lib/utils.js';
 import Utils from '../classes/utils.js';
 import Krill from '../krill/classes/prepare.js';
 const agent = new https.Agent({

package/dist/commands/produce.js

@@ -209,14 +209,19 @@ export default class Produce extends Command {
                 let message = "this is a GUI system, calamares is available, but NOT installed\n";
                 Utils.warning(message);
             }
-            if (fullcrypt) {
+            if (fullcrypt && Utils.isAppImage()) {
+                Utils.warning("eggs --fullcrypt cannot be used on AppImage");
+                process.exit(0);
+            }
+            else {
                 const distro = new Distro();
-                if (distro.familyId === 'debian') {
-                    Utils.info("Use penguins-eggs and this option in particular with extreme caution, and ALWAYS first try it out in a test environment.");
+                // 
+                if (distro.familyId === 'debian' && (distro.codenameId === 'trixie' || distro.codenameId === 'excalibur')) {
+                    Utils.info("Use eggs --fullcrypt with extreme caution, and ALWAYS first try it out in a test environment.");
                     Utils.sleep(3000);
                 }
                 else {
-                    Utils.warning("This option is still in the experimental phase and can only be tested on Debian trixie");
+                    Utils.warning("eggs --fullcrypt can be used only with Debian trixie or Devuan excalibur");
                     process.exit(9);
                 }
             }

package/dist/commands/setup/install.js

@@ -10,7 +10,7 @@ import Utils from '../../classes/utils.js';
 import Pacman from '../../classes/pacman.js';
 import { Command } from '@oclif/core';
 import { DependencyManager } from '../../appimage/dependency-manager.js';
-import { execSync } from 'node:child_process';
+import { execSync } from '../../lib/utils.js';
 export default class Install extends Command {
     static description = 'Automatically check and install system prerequisites';
     static examples = [

package/dist/commands/setup/purge.js

@@ -10,7 +10,7 @@ import Utils from '../../classes/utils.js';
 import Pacman from '../../classes/pacman.js';
 import { Command } from '@oclif/core';
 import { DependencyManager } from '../../appimage/dependency-manager.js';
-import { execSync } from 'node:child_process';
+import { execSync } from '../../lib/utils.js';
 export default class Purge extends Command {
     static description = 'Automatically check and install system prerequisites';
     static examples = [

package/dist/commands/tools/yolk.js

@@ -7,7 +7,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import fs from 'node:fs';
-import shx from 'shelljs';
+import { shx } from '../../lib/utils.js';
 import Utils from '../../classes/utils.js';
 import Yolk from '../../classes/yolk.js';
 /**

package/dist/commands/update.js

@@ -11,8 +11,7 @@ import Distro from '../classes/distro.js';
 import Tools from '../classes/tools.js';
 import Utils from '../classes/utils.js';
 import Diversions from '../classes/diversions.js';
-import { exec } from '../lib/utils.js';
-import { spawn } from 'child_process';
+import { exec, spawn } from '../lib/utils.js';
 import axios from 'axios';
 import https from 'node:https';
 const agent = new https.Agent({

package/dist/interfaces/i-exec.d.ts

@@ -8,4 +8,5 @@
 export interface IExec {
     code: number;
     data: string;
+    error?: string;
 }

package/dist/krill/classes/prepare.d/location.js

@@ -12,7 +12,7 @@ import Location from '../../components/location.js';
 import selectRegions from '../../lib/select_regions.js';
 import selectZones from '../../lib/select_zones.js';
 import axios from 'axios';
-import shx from 'shelljs';
+import { shx } from '../../../lib/utils.js';
 /**
  *
  * @param this

package/dist/krill/classes/prepare.d/partitions.js

@@ -14,7 +14,7 @@ import selectFileSystemType from '../../lib/select_filesystem_type.js';
 import selectInstallationDevice from '../../lib/select_installation_device.js';
 import selectReplacedPartition from '../../lib/select_replaced_partition.js';
 import selectUserSwapChoice from '../../lib/select_user_swap_choice.js';
-import shx from 'shelljs';
+import { shx } from '../../../lib/utils.js';
 import selectInstallationMode from '../../lib/select_installation_mode.js';
 /**
  * PARTITIONS

package/dist/krill/classes/prepare.d/users.js

@@ -13,7 +13,7 @@ import getUsername from '../../lib/get_username.js';
 import getUserfullname from '../../lib/get_userfullname.js';
 import getPassword from '../../lib/get_password.js';
 import getHostname from '../../lib/get_hostname.js';
-import shx from 'shelljs';
+import { shx } from '../../../lib/utils.js';
 /**
  * USERS
  */
@@ -36,7 +36,7 @@ export async function users() {
     }
     let hostname = this.krillConfig.hostname;
     if (hostname === '' || hostname === undefined) {
-        hostname = shx.exec('cat /etc/hostname').trim();
+        hostname = shx.exec('cat /etc/hostname').stdout.trim();
     }
     let autologin = true;
     let sameUserPassword = true;

package/dist/krill/classes/prepare.js

@@ -8,7 +8,7 @@
  */
 import os from 'os';
 import fs from 'fs';
-import shx from 'shelljs';
+import { shx } from '../../lib/utils.js';
 import axios from 'axios';
 import { SwapChoice, InstallationMode, FsType } from './krill_enums.js';
 import Keyboards from '../../classes/keyboards.js';
@@ -199,15 +199,15 @@ export default class Krill {
     generateHostname(ip, random) {
         let hostname = this.krillConfig.hostname;
         if (hostname === '') {
-            hostname = shx.exec('cat /etc/hostname', { silent: true }).trim();
+            hostname = shx.exec('cat /etc/hostname', { silent: true }).stdout.trim();
         }
         if (ip) {
             hostname = 'ip-' + Utils.address().replaceAll('.', '-');
         }
         if (random) {
-            const fl = shx.exec(`tr -dc a-z </dev/urandom | head -c 2 ; echo ''`, { silent: true }).trim();
-            const n = shx.exec(`tr -dc 0-9 </dev/urandom | head -c 3 ; echo ''`, { silent: true }).trim();
-            const sl = shx.exec(`tr -dc a-z </dev/urandom | head -c 2 ; echo ''`, { silent: true }).trim();
+            const fl = shx.exec(`tr -dc a-z </dev/urandom | head -c 2 ; echo ''`, { silent: true }).stdout.trim();
+            const n = shx.exec(`tr -dc 0-9 </dev/urandom | head -c 3 ; echo ''`, { silent: true }).stdout.trim();
+            const sl = shx.exec(`tr -dc a-z </dev/urandom | head -c 2 ; echo ''`, { silent: true }).stdout.trim();
             hostname = `${os.hostname()}-${fl}${n}${sl}`;
         }
         return hostname;

package/dist/krill/classes/sequence.d/add_user.d.ts

@@ -1,20 +1,8 @@
 /**
- * ./src/krill/modules/add-user.ts
+ * ./src/krill/classes/secquence.d/add-user.ts
  * penguins-eggs v.25.7.x / 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
+ * * REFACTORED: Uses "The SysUser Master" class.
+ * Replaces chroot/binary dependencies with pure Node.js manipulation.
  */
 import Sequence from '../sequence.js';
-/**
- *
- * @param this
- * @param username
- * @param password
- * @param fullusername
- * @param roomNumber
- * @param workPhone
- * @param homePhone
- */
 export default function addUser(this: Sequence, username?: string, password?: string, fullusername?: string, roomNumber?: string, workPhone?: string, homePhone?: string): Promise<void>;