penguins-eggs 10.0.45 → 10.0.46

package/.oclif.manifest.json

@@ -1498,5 +1498,5 @@
       ]
     }
   },
-  "version": "10.0.45"
+  "version": "10.0.46"
 }

package/README.md

@@ -490,7 +490,7 @@ EXAMPLES
   $ eggs adapt
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -511,7 +511,7 @@ EXAMPLES
   sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -575,7 +575,7 @@ EXAMPLES
   sudo eggs calamares --remove
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -602,7 +602,7 @@ EXAMPLES
   sudo eggs config --clean --nointeractive
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/config.ts)_
 
 ## `eggs cuckoo`
 
@@ -622,7 +622,7 @@ EXAMPLES
   sudo eggs cuckoo
 ```
 
-_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/cuckoo.ts)_
+_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -650,7 +650,7 @@ EXAMPLES
   sudo dad --default
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/dad.ts)_
 
 ## `eggs export iso`
 
@@ -675,7 +675,7 @@ EXAMPLES
   $ eggs export iso --clean
 ```
 
-_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/export/iso.ts)_
+_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/export/iso.ts)_
 
 ## `eggs export pkg`
 
@@ -702,7 +702,7 @@ EXAMPLES
   $ eggs export pkg --all
 ```
 
-_See code: [src/commands/export/pkg.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/export/pkg.ts)_
+_See code: [src/commands/export/pkg.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/export/pkg.ts)_
 
 ## `eggs help [COMMAND]`
 
@@ -763,7 +763,7 @@ EXAMPLES
   sudo eggs install --chroot
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -786,7 +786,7 @@ EXAMPLES
   sudo eggs kill
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -846,7 +846,7 @@ EXAMPLES
   $ eggs auto
 ```
 
-_See code: [src/commands/love.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/love.ts)_
+_See code: [src/commands/love.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/love.ts)_
 
 ## `eggs mom`
 
@@ -866,7 +866,7 @@ EXAMPLES
   $ eggs mom
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -923,7 +923,7 @@ EXAMPLES
   sudo eggs produce --excludes home    # exclude ~/*
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -944,7 +944,7 @@ EXAMPLES
   $ eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -970,7 +970,7 @@ EXAMPLES
   sudo eggs syncfrom --file /path/to/luks-volume
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -997,7 +997,7 @@ EXAMPLES
   sudo eggs syncto --excludes
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -1019,7 +1019,7 @@ EXAMPLES
   sudo eggs tools clean
 ```
 
-_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/tools/clean.ts)_
+_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/tools/clean.ts)_
 
 ## `eggs tools ppa`
 
@@ -1045,7 +1045,7 @@ EXAMPLES
   sudo eggs tools ppa --remove
 ```
 
-_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/tools/ppa.ts)_
+_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/tools/ppa.ts)_
 
 ## `eggs tools skel`
 
@@ -1069,7 +1069,7 @@ EXAMPLES
   sudo eggs tools skel --user user-to-be-copied
 ```
 
-_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/tools/skel.ts)_
+_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/tools/skel.ts)_
 
 ## `eggs tools stat`
 
@@ -1095,7 +1095,7 @@ EXAMPLES
   $ eggs tools stat --year
 ```
 
-_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/tools/stat.ts)_
+_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/tools/stat.ts)_
 
 ## `eggs tools yolk`
 
@@ -1116,7 +1116,7 @@ EXAMPLES
   sudo eggs tools yolk
 ```
 
-_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/tools/yolk.ts)_
+_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/tools/yolk.ts)_
 
 ## `eggs update`
 
@@ -1137,7 +1137,7 @@ EXAMPLES
   $ eggs update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/update.ts)_
 
 ## `eggs version`
 
@@ -1183,7 +1183,7 @@ EXAMPLES
   $ eggs wardrobe get your-wardrobe
 ```
 
-_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/wardrobe/get.ts)_
+_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/wardrobe/get.ts)_
 
 ## `eggs wardrobe list [REPO]`
 
@@ -1212,7 +1212,7 @@ EXAMPLES
   $ eggs wardrobe list --distro arch
 ```
 
-_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/wardrobe/list.ts)_
+_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/wardrobe/list.ts)_
 
 ## `eggs wardrobe show [REPO]`
 
@@ -1242,7 +1242,7 @@ EXAMPLES
   $ eggs wardrobe show accessories/
 ```
 
-_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/wardrobe/show.ts)_
+_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/wardrobe/show.ts)_
 
 ## `eggs wardrobe wear [REPO]`
 
@@ -1273,7 +1273,7 @@ EXAMPLES
   sudo eggs wardrobe wear wagtail/waydroid
 ```
 
-_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.45/src/commands/wardrobe/wear.ts)_
+_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.46/src/commands/wardrobe/wear.ts)_
 <!-- commandsstop -->
 
 # penGUI

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

@@ -5,8 +5,7 @@
 #The DM module attempts to set up all the DMs found in this list, in that precise order.
 #It also sets up autologin, if the feature is enabled in globalstorage.
 #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
-displaymanagers: 
-{{displaymanagers}}
+displaymanagers: none
 
 #Enable the following settings to force a desktop environment in your displaymanager configuration file:
 #defaultDesktopEnvironment:

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

@@ -2,5 +2,4 @@
 ---
 restartNowEnabled: true
 restartNowChecked: true
-restartNowCommand: {{restartNowCommand}}
-# restartNowCommand: "systemctl -i reboot"
+restartNowCommand: none

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

@@ -12,4 +12,4 @@
 # continues as normal.
 ---
 # Username in the target system to be removed.
-username: {{username}}
+username: node

package/conf/distros/rolling/calamares/modules/displaymanager.yml

@@ -4,8 +4,7 @@
 #The DM module attempts to set up all the DMs found in this list, in that precise order.
 #It also sets up autologin, if the feature is enabled in globalstorage.
 #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
-displaymanagers: 
-{{displaymanagers}}
+displaymanagers: none
 
 #Enable the following settings to force a desktop environment in your displaymanager configuration file:
 #defaultDesktopEnvironment:

package/conf/distros/rolling/calamares/modules/shellprocess_removelink.yml

@@ -1,6 +1,6 @@
 # Arch
 # Calamares 3.3
---
+---
 dontChroot: false
 timeout: 30
 script:

package/dist/classes/families/archlinux.js

@@ -21,7 +21,8 @@ export default class Archlinux {
     static async calamaresInstall(verbose = false) {
         verbose = true; // serve per pacman
         const echo = Utils.setEcho(verbose);
-        const cal_eggs = 'calamares-eggs-3.3.9-1-x86_64.pkg.tar.zst'; // 01/09/2024
+        // const cal_eggs = 'calamares-eggs-3.3.9-1-x86_64.pkg.tar.zst' // 01/09/2024
+        const cal_eggs = 'calamares-eggs-3.3.10-1-x86_64.pkg.tar.zst'; // 24/10/2024
         let cmd = `wget -O /tmp/${cal_eggs} https://sourceforge.net/projects/penguins-eggs/files/Packages/AUR/${cal_eggs}/download`;
         try {
             await exec(cmd, echo);

package/dist/classes/incubation/fisherman-helper/displaymanager.d.ts

@@ -8,4 +8,4 @@
 /**
  * restituisce displaymanagers in uso
  */
-export declare function displaymanager(): string;
+export declare function displaymanager(): string[];

package/dist/classes/incubation/fisherman-helper/displaymanager.js

@@ -10,30 +10,31 @@ import Pacman from '../../pacman.js';
  * restituisce displaymanagers in uso
  */
 export function displaymanager() {
-    let text = '';
-    text += addIfExist('slim');
-    text += addIfExist('sddm');
-    text += addIfExist('lightdm');
-    text += addIfExist('gdm');
-    text += addIfExist('gdm3');
-    text += addIfExist('mdm');
-    text += addIfExist('lxdm');
-    text += addIfExist('kdm');
-    return text;
-}
-/*
- * @param package2check
- */
-function addIfExist(package2check) {
-    let content = '';
-    if (Pacman.packageIsInstalled(package2check)) {
-        let displayManager = package2check;
-        if (package2check === 'gdm3') {
-            // gdm3 is treat as gdm
-            displayManager = 'gdm';
-        }
-        content = `- ${displayManager}\n`;
-        // text += text === '' ? `- ${displayManager}\n` : `                 - ${displayManager}\n`
-    }
-    return content;
+    let ret = [];
+    if (Pacman.packageIsInstalled('gdm')) {
+        ret.push('gdm');
+    }
+    if (Pacman.packageIsInstalled('gdm3')) {
+        // gdm3 viene trattato come gdm
+        ret.push('gdm');
+    }
+    if (Pacman.packageIsInstalled('kdm')) {
+        ret.push('kdm');
+    }
+    if (Pacman.packageIsInstalled('lightdm')) {
+        ret.push('lightdm');
+    }
+    if (Pacman.packageIsInstalled('lxdm')) {
+        ret.push('lxdm');
+    }
+    if (Pacman.packageIsInstalled('mdm')) {
+        ret.push('mdm');
+    }
+    if (Pacman.packageIsInstalled('sddm')) {
+        ret.push('sddm');
+    }
+    if (Pacman.packageIsInstalled('slim')) {
+        ret.push('slim');
+    }
+    return ret;
 }

package/dist/classes/incubation/fisherman-helper/settings.js

@@ -40,7 +40,7 @@ export async function settings(src, dest, theme = 'eggs', isClone = false) {
         createUsers = '# ';
     }
     let hasDisplaymanager = '# ';
-    if (displaymanager() !== '') {
+    if (displaymanager().length > 0) {
         hasDisplaymanager = '- ';
     }
     shx.sed('-i', '{{hasSystemd}}', hasSystemd, settingsDest);

package/dist/classes/incubation/fisherman.d.ts

@@ -1,10 +1,3 @@
-/**
- * ./src/classes/incubation/fisherman.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
 import { IDistro, IInstaller } from '../../interfaces/index.js';
 export default class Fisherman {
     distro: IDistro;
@@ -38,20 +31,32 @@ export default class Fisherman {
      */
     createCalamaresSettings(theme?: string, isClone?: boolean): Promise<void>;
     /**
-     * usa i moduli-ts
+     *
+     * @param name
      */
-    moduleDisplaymanager(): Promise<void>;
+    shellprocess(name: string): Promise<void>;
+    /**
+     *
+     * @param module
+     * @param type
+     * @param path
+     */
+    show(name: string, type: string, path: string): void;
+    /**
+   * ====================================================================================
+   * M O D U L E S
+   * ====================================================================================
+   */
     /**
      * Al momento rimane con la vecchia configurazione
      */
-    moduleFinished(): Promise<void>;
+    moduleDisplaymanager(): Promise<void>;
     /**
-     * ====================================================================================
-     * M O D U L E S
-     * ====================================================================================
+     * Al momento rimane con la vecchia configurazione
      */
+    moduleFinished(): Promise<void>;
     /**
-     * usa i moduli-ts
+     * Al momento rimane con la vecchia configurazione
      */
     modulePackages(distro: IDistro, release?: boolean): Promise<void>;
     /**
@@ -62,16 +67,4 @@ export default class Fisherman {
      * Al momento rimane con la vecchia configurazione
      */
     moduleUnpackfs(): Promise<void>;
-    /**
-     *
-     * @param name
-     */
-    shellprocess(name: string): Promise<void>;
-    /**
-     *
-     * @param module
-     * @param type
-     * @param path
-     */
-    show(name: string, type: string, path: string): void;
 }

package/dist/classes/incubation/fisherman.js

@@ -10,10 +10,15 @@ import mustache from 'mustache';
 import fs from 'node:fs';
 import path from 'node:path';
 import shx from 'shelljs';
+import yaml from 'js-yaml';
 import { exec } from '../../lib/utils.js';
 import { settings } from './fisherman-helper/settings.js';
 // _dirname
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
+// pjson
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+const pjson = require('../../../package.json');
 /**
  * vecchi require che vanno sostituiti con import
  */
@@ -74,7 +79,7 @@ export default class Fisherman {
      * @param name
      * @param replaces [['search','replace']]
      */
-    async buildModule(name, vendor = '') {
+    async buildModule(name, vendor = 'eggs') {
         let moduleSource = path.resolve(__dirname, this.installer.templateModules + name + '.yml');
         /**
          * We need vendor here to have possibility to load custom modules for calamares
@@ -148,13 +153,68 @@ export default class Fisherman {
         await settings(this.installer.template, this.installer.configRoot, theme, isClone);
     }
     /**
-     * usa i moduli-ts
+     *
+     * @param name
+     */
+    async shellprocess(name) {
+        const moduleSource = path.resolve(__dirname, this.installer.templateModules + 'shellprocess_' + name + '.yml');
+        const moduleDest = this.installer.modules + 'shellprocess_' + name + '.conf';
+        if (fs.existsSync(moduleSource)) {
+            if (this.verbose)
+                this.show(name, 'shellprocess', moduleDest);
+            shx.cp(moduleSource, moduleDest);
+        }
+        else if (this.verbose) {
+            console.log(`calamares: ${name} shellprocess, nothing to do`);
+        }
+    }
+    /**
+     *
+     * @param module
+     * @param type
+     * @param path
+     */
+    show(name, type, path) {
+        switch (type) {
+            case 'module': {
+                console.log('fisherman: ' + chalk.yellow(name) + ' module in ' + chalk.yellow(path));
+                break;
+            }
+            case 'calamares_module': {
+                console.log('fisherman: ' + chalk.cyanBright(name) + ' calamares_module in ' + chalk.cyanBright(path));
+                break;
+            }
+            case 'shellprocess': {
+                console.log('fisherman: ' + chalk.green(name) + ' shellprocess in ' + chalk.green(path));
+                break;
+            }
+            case 'contextualprocess': {
+                console.log('fisherman: ' + chalk.cyanBright(name) + ' shellprocess in ' + chalk.cyanBright(path));
+                break;
+            }
+            // No default
+        }
+    }
+    /**
+   * ====================================================================================
+   * M O D U L E S
+   * ====================================================================================
+   */
+    /**
+     * Al momento rimane con la vecchia configurazione
      */
     async moduleDisplaymanager() {
         const name = 'displaymanager';
         // const displaymanager = require('./fisherman-helper/displaymanager').displaymanager
         this.buildModule(name);
-        shx.sed('-i', '{{displaymanagers}}', displaymanager(), this.installer.modules + name + '.conf');
+        let file = `/etc/calamares/modules/${name}.conf`;
+        let fileContent = fs.readFileSync(file, 'utf8');
+        let yamlValues = yaml.load(fileContent);
+        yamlValues.displaymanagers = displaymanager();
+        let destContent = `# ${name}.conf, created by penguins-eggs ${pjson.version}\n`;
+        destContent += '---\n';
+        destContent += yaml.dump(yamlValues);
+        fs.writeFileSync(file, destContent, 'utf8');
     }
     /**
      * Al momento rimane con la vecchia configurazione
@@ -162,16 +222,16 @@ export default class Fisherman {
     async moduleFinished() {
         const name = 'finished';
         await this.buildModule(name);
-        const restartNowCommand = 'reboot';
-        shx.sed('-i', '{{restartNowCommand}}', restartNowCommand, this.installer.modules + name + '.conf');
+        let file = `/etc/calamares/modules/${name}.conf`;
+        let fileContent = fs.readFileSync(file, 'utf8');
+        let yamlValues = yaml.load(fileContent);
+        yamlValues.restartNowCommand = 'reboot';
+        let destContent = `# ${name}.conf, created by penguins-eggs ${pjson.version}\n`;
+        destContent += '---\n';
+        destContent += yaml.dump(yamlValues);
     }
     /**
-     * ====================================================================================
-     * M O D U L E S
-     * ====================================================================================
-     */
-    /**
-     * usa i moduli-ts
+     * Al momento rimane con la vecchia configurazione
      */
     async modulePackages(distro, release = false) {
         const name = 'packages';
@@ -189,6 +249,36 @@ export default class Fisherman {
         }
         shx.sed('-i', '{{operations}}', operations, this.installer.modules + name + '.conf');
     }
+    /*
+      const name = 'packages'
+      this.buildModule(name)
+      let file = `/etc/calamares/modules/${name}.conf`
+      let fileContent = fs.readFileSync(file, 'utf8')
+      let values = yaml.load(fileContent) as ICalamaresPackages
+      console.log(values)
+      let destContent = `# ${name}.conf, created by penguins-eggs ${pjson.version}\n`
+      destContent += '---\n'
+      destContent += yaml.dump(values)
+  
+      // const removePackages = require('./fisherman-helper/packages').remove
+      // const tryInstall = require('./fisherman-helper/packages').tryInstall
+      
+  
+      const yamlInstall = tryInstall(distro)
+  
+      let yamlRemove = ''
+      if (release) {
+        yamlRemove = removePackages(distro)
+      }
+  
+      let operations = ''
+      if (yamlRemove !== '' || yamlInstall !== '') {
+        operations = 'operations:\n' + yamlRemove + yamlInstall
+      }
+  
+      shx.sed('-i', '{{operations}}', operations, this.installer.modules + name + '.conf')
+    }
+    */
     /**
      * Al momento rimane con la vecchia configurazione
      */
@@ -205,47 +295,4 @@ export default class Fisherman {
         this.buildModule(name);
         shx.sed('-i', '{{source}}', this.distro.liveMediumPath + this.distro.squashfs, this.installer.modules + name + '.conf');
     }
-    /**
-     *
-     * @param name
-     */
-    async shellprocess(name) {
-        const moduleSource = path.resolve(__dirname, this.installer.templateModules + 'shellprocess_' + name + '.yml');
-        const moduleDest = this.installer.modules + 'shellprocess_' + name + '.conf';
-        if (fs.existsSync(moduleSource)) {
-            if (this.verbose)
-                this.show(name, 'shellprocess', moduleDest);
-            shx.cp(moduleSource, moduleDest);
-        }
-        else if (this.verbose) {
-            console.log(`calamares: ${name} shellprocess, nothing to do`);
-        }
-    }
-    /**
-     *
-     * @param module
-     * @param type
-     * @param path
-     */
-    show(name, type, path) {
-        switch (type) {
-            case 'module': {
-                console.log('fisherman: ' + chalk.yellow(name) + ' module in ' + chalk.yellow(path));
-                break;
-            }
-            case 'calamares_module': {
-                console.log('fisherman: ' + chalk.cyanBright(name) + ' calamares_module in ' + chalk.cyanBright(path));
-                break;
-            }
-            case 'shellprocess': {
-                console.log('fisherman: ' + chalk.green(name) + ' shellprocess in ' + chalk.green(path));
-                break;
-            }
-            case 'contextualprocess': {
-                console.log('fisherman: ' + chalk.cyanBright(name) + ' shellprocess in ' + chalk.cyanBright(path));
-                break;
-            }
-            // No default
-        }
-    }
 }

package/dist/classes/incubation/incubator.d.ts

@@ -29,6 +29,10 @@ export default class Incubator {
      * config
      */
     config(release?: boolean): Promise<void>;
+    /**
+   *
+   */
+    private compact;
     /**
      *
      */

package/dist/classes/incubation/incubator.js

@@ -5,11 +5,16 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+// pjson
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+const pjson = require('../../../package.json');
 // partition
 import yaml from 'js-yaml';
 import fs from 'node:fs';
 import path from 'node:path';
 import shx from 'shelljs';
+import { exec } from '../../lib/utils.js';
 import Pacman from '../pacman.js';
 import Utils from '../utils.js';
 import { Alpine } from './distros/alpine.js';
@@ -178,9 +183,35 @@ export default class Incubator {
             }
         }
         if (Pacman.calamaresExists()) {
-            partitionCustomize();
+            await partitionCustomize();
+            await this.compact();
         }
     }
+    /**
+   *
+   */
+    async compact() {
+        // modules
+        let path = '/etc/calamares/modules/';
+        const elements = fs.readdirSync(path);
+        for (const elem of elements) {
+            let file = path + elem;
+            let fileContent = fs.readFileSync(file, 'utf8');
+            let yamlContent = yaml.load(fileContent);
+            let destContent = `# ${elem}, created by penguins-eggs ${pjson.version}\n`;
+            destContent += '---\n';
+            destContent += yaml.dump(yamlContent);
+            fs.writeFileSync(file, destContent, 'utf8');
+        }
+        // settings
+        let file = '/etc/calamares/settings.conf';
+        let fileContent = fs.readFileSync(file, 'utf8');
+        let yamlContent = yaml.load(fileContent);
+        let destContent = `# settings.conf, created by penguins-eggs ${pjson.version}\n`;
+        destContent += '---\n';
+        destContent += yaml.dump(yamlContent);
+        fs.writeFileSync(file, destContent, 'utf8');
+    }
     /**
      *
      */
@@ -331,10 +362,12 @@ function write(file, content, verbose = false) {
 /**
  *
  */
-function partitionCustomize() {
+async function partitionCustomize() {
     const filePartition = '/etc/calamares/modules/partition.conf';
     const partition = yaml.load(fs.readFileSync(filePartition, 'utf8'));
-    partition.defaultFileSystemType = 'ext4';
+    // detect filesystem type
+    let test = await exec(`df -T / | awk 'NR==2 {print $2}'`, { capture: true, echo: false });
+    partition.defaultFileSystemType = test.data.trim();
     partition.availableFileSystemTypes = ['ext4'];
     if (Pacman.packageIsInstalled('btrfs-progs')) {
         partition.availableFileSystemTypes.push('btrfs');

package/dist/classes/ovary.js

@@ -1508,7 +1508,7 @@ export default class Ovary {
                         /**
                          * GUI installed but NOT Desktop Manager: just create motd and issue
                          */
-                        if (displaymanager() === '') {
+                        if (displaymanager().length > 0) {
                             this.cliAutologin.addIssue(this.settings.distro.distroId, this.settings.distro.codenameId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
                             this.cliAutologin.addMotd(this.settings.distro.distroId, this.settings.distro.codenameId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
                         }

package/dist/classes/settings.js

@@ -9,10 +9,10 @@ import chalk from 'chalk';
 import yaml from 'js-yaml';
 // packages
 import fs from 'node:fs';
-// pjson
-import { createRequire } from 'node:module';
 import os from 'node:os';
 import shx from 'shelljs';
+// pjson
+import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 const pjson = require('../../package.json');
 import Distro from './distro.js';

package/dist/interfaces/i-calamares-displaymanager.d.ts

@@ -0,0 +1,17 @@
+/**
+ * ./src/interfaces/i-calamares-displaymanager.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export interface ICalamaresDisplaymanager {
+    displaymanagers: string[];
+    basicSetup: boolean;
+    sysconfigSetup: boolean;
+    defaultDesktopEnvironment?: DesktopEnvironment;
+}
+export interface DesktopEnvironment {
+    executable: string;
+    desktopFile: string;
+}

package/dist/interfaces/i-calamares-displaymanager.js

@@ -0,0 +1 @@
+export {};

package/dist/interfaces/i-calamares-finished.d.ts

@@ -0,0 +1,12 @@
+/**
+ * ./src/interfaces/i-calamares-finished.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export interface ICalamaresFinished {
+    restartNowMode: 'never' | 'user-unchecked' | 'user-checked' | 'always';
+    restartNowCommand?: string;
+    notifyOnFinished: boolean;
+}

package/dist/interfaces/i-calamares-finished.js

@@ -0,0 +1 @@
+export {};

package/dist/interfaces/i-calamares-packages.d.ts

@@ -0,0 +1,28 @@
+/**
+ * ./src/interfaces/i-calamares-packages.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export interface ICalamaresPackages {
+    backend: 'apk' | 'apt' | 'dnf' | 'dnf5' | 'entropy' | 'luet' | 'packagekit' | 'pacman' | 'pamac' | 'portage' | 'yum' | 'zypp' | 'dummy';
+    update_db?: boolean;
+    update_system?: boolean;
+    skip_if_no_internet?: boolean;
+    pacman?: PacmanConfig;
+    operations?: Operation[];
+}
+export interface PacmanConfig {
+    num_retries?: number;
+    disable_download_timeout?: boolean;
+    needed_only?: boolean;
+}
+export interface Operation {
+    install?: any[];
+    remove?: any[];
+    try_install?: any[];
+    try_remove?: any[];
+    localInstall?: any[];
+    source?: string;
+}

package/dist/interfaces/i-calamares-packages.js

@@ -0,0 +1 @@
+export {};

package/dist/interfaces/i-calamares-partition.d.ts

@@ -6,13 +6,35 @@
  * license: MIT
  */
 export interface ICalamaresPartition {
-    alwaysShowPartitionLabels: boolean;
-    availableFileSystemTypes: string[];
-    defaultFileSystemType: string;
-    drawNestedPartitions: boolean;
     efiSystemPartition: string;
+    efiSystemPartitionSize?: string;
+    userSwapChoices: string[];
+    swapPartitionName?: string;
+    drawNestedPartitions: boolean;
+    alwaysShowPartitionLabels: boolean;
     initialPartitioningChoice: string;
     initialSwapChoice: string;
-    requiredStorage: 6;
-    userSwapChoices: string[];
+    defaultFileSystemType: string;
+    availableFileSystemTypes: string[];
+    requiredStorage: number;
+    ensureSuspendToDisk?: boolean;
+    neverCreateSwap?: boolean;
+    defaultPartitionTableType?: string;
+    requiredPartitionTableType?: string | string[];
+    enableLuksAutomatedPartitioning?: boolean;
+    partitionLayout?: PartitionLayout[];
+}
+export interface PartitionLayout {
+    name: string;
+    type?: string;
+    uuid?: string;
+    attributes?: string;
+    filesystem?: string;
+    mountPoint?: string;
+    size: string;
+    minSize?: string;
+    maxSize?: string;
+    features?: {
+        [key: string]: boolean | number | string;
+    };
 }

package/dist/interfaces/i-calamares-partition.js

@@ -1,8 +1 @@
-/**
- * ./src/interfaces/i-calamares-partition.ts
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
 export {};

package/package.json

@@ -2,14 +2,14 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "10.0.45",
+  "version": "10.0.46",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
   },
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
-    "@oclif/core": "^4.0.28",
+    "@oclif/core": "^4.0.30",
     "@oclif/plugin-autocomplete": "^3.2.6",
     "@oclif/plugin-help": "^6.2.16",
     "@oclif/plugin-version": "^2.2.15",
@@ -44,15 +44,15 @@
     "@types/netmask": "^2.0.5",
     "@types/node": "^20.16.1",
     "@types/node-static": "^0.7.11",
-    "@types/react": "^18.3.10",
+    "@types/react": "^18.3.12",
     "@types/shelljs": "^0.8.15",
-    "chai": "^5.1.1",
+    "chai": "^5.1.2",
     "eslint": "^8.57.0",
     "eslint-config-oclif": "^5.2.1",
     "eslint-config-oclif-typescript": "^3.1.12",
     "eslint-config-prettier": "^9.1.0",
     "mocha": "^10.7.3",
-    "oclif": "^4.15.8",
+    "oclif": "^4.15.12",
     "perrisbrewery": "^10.0.2",
     "prettier": "^3.3.3",
     "shx": "^0.3.4",

package/dist/classes/n8.d.ts

@@ -1,18 +0,0 @@
-/**
- * ./src/classes/n8.ts (node 8)
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-import { Dirent } from 'node:fs';
-export default class n8 {
-    static dirent2string(dir: Dirent): string;
-    /**
-     *
-     * @param dirPath
-     */
-    static isDirectory(name: string): boolean;
-    static isFile(name: string): boolean;
-    static isSymbolicLink(name: string): boolean;
-}

package/dist/classes/n8.js

@@ -1,36 +0,0 @@
-/**
- * ./src/classes/n8.ts (node 8)
- * penguins-eggs v.10.0.0 / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-import fs from 'node:fs';
-export default class n8 {
-    static dirent2string(dir) {
-        return dir.name;
-        // Removed not needed more node8 is past
-        let dirname = '';
-        dirname = process.versions.node.split('.')[0] === '8' ? JSON.stringify(dir).replace('"', '').replace('"', '') : dir.name;
-        return dirname;
-    }
-    /**
-     *
-     * @param dirPath
-     */
-    static isDirectory(name) {
-        const path = '/' + name;
-        const isDirectory = fs.existsSync(path) && fs.lstatSync(path).isDirectory();
-        return isDirectory;
-    }
-    static isFile(name) {
-        const path = '/' + name;
-        const isFile = fs.existsSync(path) && fs.lstatSync(path).isFile();
-        return isFile;
-    }
-    static isSymbolicLink(name) {
-        const path = '/' + name;
-        const isSymbolicLink = fs.existsSync(path) && fs.lstatSync(path).isSymbolicLink();
-        return isSymbolicLink;
-    }
-}