penguins-eggs 10.0.7 → 10.0.10

package/.oclif.manifest.json

@@ -260,7 +260,7 @@
         },
         "default": {
           "char": "d",
-          "description": "remove old configuration and force default",
+          "description": "reset to default values",
           "name": "default",
           "allowNo": false,
           "type": "boolean"
@@ -272,6 +272,14 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "file": {
+          "char": "f",
+          "description": "use a file configuration custom",
+          "name": "file",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "verbose": {
           "char": "v",
           "name": "verbose",
@@ -1450,5 +1458,5 @@
       ]
     }
   },
-  "version": "10.0.7"
+  "version": "10.0.10"
 }

package/README.md

@@ -466,7 +466,7 @@ EXAMPLES
   $ eggs adapt
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -487,7 +487,7 @@ EXAMPLES
   sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -551,7 +551,7 @@ EXAMPLES
   sudo eggs calamares --remove
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -578,7 +578,7 @@ EXAMPLES
   sudo eggs config --clean --nointeractive
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/config.ts)_
 
 ## `eggs cuckoo`
 
@@ -598,7 +598,7 @@ EXAMPLES
   sudo eggs cuckoo
 ```
 
-_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/cuckoo.ts)_
+_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -606,12 +606,13 @@ ask help from daddy - TUI configuration helper
 
 ```
 USAGE
-  $ eggs dad [-c] [-d] [-h] [-v]
+  $ eggs dad [-c] [-d] [-h] [-f <value>] [-v]
 
 FLAGS
-  -c, --clean    remove old configuration before to create
-  -d, --default  remove old configuration and force default
-  -h, --help     Show CLI help.
+  -c, --clean         remove old configuration before to create
+  -d, --default       reset to default values
+  -f, --file=<value>  use a file configuration custom
+  -h, --help          Show CLI help.
   -v, --verbose
 
 DESCRIPTION
@@ -625,7 +626,7 @@ EXAMPLES
   sudo dad --default
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -652,7 +653,7 @@ EXAMPLES
   $ eggs export deb --all
 ```
 
-_See code: [src/commands/export/deb.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/export/deb.ts)_
+_See code: [src/commands/export/deb.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/export/deb.ts)_
 
 ## `eggs export iso`
 
@@ -677,7 +678,7 @@ EXAMPLES
   $ eggs export iso --clean
 ```
 
-_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/export/iso.ts)_
+_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/export/iso.ts)_
 
 ## `eggs help [COMMAND]`
 
@@ -738,7 +739,7 @@ EXAMPLES
   sudo eggs install --chroot
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -761,7 +762,7 @@ EXAMPLES
   sudo eggs kill
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -820,7 +821,7 @@ EXAMPLES
   $ eggs mom
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -871,7 +872,7 @@ EXAMPLES
   sudo eggs produce --basename=colibri --theme theme --addons adapt
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -892,7 +893,7 @@ EXAMPLES
   $ eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -918,7 +919,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.7/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -945,7 +946,7 @@ EXAMPLES
   sudo eggs syncto --excludes
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -967,7 +968,7 @@ EXAMPLES
   sudo eggs tools clean
 ```
 
-_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/tools/clean.ts)_
+_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/clean.ts)_
 
 ## `eggs tools ppa`
 
@@ -993,7 +994,7 @@ EXAMPLES
   sudo eggs tools ppa --remove
 ```
 
-_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/tools/ppa.ts)_
+_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/ppa.ts)_
 
 ## `eggs tools skel`
 
@@ -1017,7 +1018,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.7/src/commands/tools/skel.ts)_
+_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/skel.ts)_
 
 ## `eggs tools stat`
 
@@ -1043,7 +1044,7 @@ EXAMPLES
   $ eggs tools stat --year
 ```
 
-_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/tools/stat.ts)_
+_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/stat.ts)_
 
 ## `eggs tools yolk`
 
@@ -1064,7 +1065,7 @@ EXAMPLES
   sudo eggs tools yolk
 ```
 
-_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/tools/yolk.ts)_
+_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/yolk.ts)_
 
 ## `eggs update`
 
@@ -1085,7 +1086,7 @@ EXAMPLES
   $ eggs update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/update.ts)_
 
 ## `eggs version`
 
@@ -1131,7 +1132,7 @@ EXAMPLES
   $ eggs wardrobe get your-wardrobe
 ```
 
-_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/wardrobe/get.ts)_
+_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/get.ts)_
 
 ## `eggs wardrobe list [REPO]`
 
@@ -1160,7 +1161,7 @@ EXAMPLES
   $ eggs wardrobe list --distro arch
 ```
 
-_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/wardrobe/list.ts)_
+_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/list.ts)_
 
 ## `eggs wardrobe show [REPO]`
 
@@ -1190,7 +1191,7 @@ EXAMPLES
   $ eggs wardrobe show accessories/
 ```
 
-_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/wardrobe/show.ts)_
+_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/show.ts)_
 
 ## `eggs wardrobe wear [REPO]`
 
@@ -1221,7 +1222,7 @@ EXAMPLES
   sudo eggs wardrobe wear wagtail/waydroid
 ```
 
-_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.7/src/commands/wardrobe/wear.ts)_
+_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/wear.ts)_
 <!-- commandsstop -->
 
 # penGUI

package/conf/custom.yaml

@@ -0,0 +1,7 @@
+# custom.yaml
+---
+root_passwd: secret
+snapshot_basename: columbus
+snapshot_prefix: '' # none
+user_opt_passwd: secret
+user_opt: user 

package/conf/distros/buster/calamares/calamares-modules/sources-yolk/sources-yolk.sh

@@ -4,66 +4,39 @@
 # We use just yolk during installation
 #
 # sources-yolk.sh
-# add yolk, rimuove LIST, LIST.d ed esegue apt non autenticato
+# add yolk
 #
 # sources-yolk.sh -u
-# remove yolk, restore LIST, LIST.d ed esegue apt non autenticato
+# remove yolk
 
 #
 #
 #
 main() {
     if [ "$1" = "-u" ]; then
-        restore
+        remove
     else
-        backup
-        yolk
+        add
     fi
     sync
     exit 0
 }
 
-#
-#
-#
-backup() {
-    if [ -f "$BACKUP" ]; then
-        rm -f "$BACKUP"
-    fi
-
-    if [ -d "$BACKUP_D" ]; then
-        rm -rf "$BACKUP_D"
-    fi
-
-    mv "$LIST" "$BACKUP"
-
-    mv "$LIST_D" "$BACKUP_D"
-}
 
 #
 #
 #
-restore() {
-    if [ -f "$LIST" ]; then
-        rm -f "$LIST"
-    fi
-
-    if [ -d "$LIST_D" ]; then
-        rm -rf "$LIST_D"
+remove() {
+    if [ -f "$YOLK_LIST" ]; then
+        rm -f "$YOLK_LIST"
     fi
-
-    mv "$BACKUP" "$LIST"
-
-    mv "$BACKUP_D" "$LIST_D"
 }
 
 #
 #
 #
-yolk() {
-    mkdir -p "$LIST_D"
-    echo "deb [trusted=yes] file:/var/local/yolk ./" > "$LIST_D/yolk.list"
-    touch "$LIST"
+add() {
+    echo "deb [trusted=yes] file:/var/local/yolk ./" > "$YOLK_LIST"
     chroot "$CHROOT" apt-get --yes update
 }
 
@@ -71,12 +44,7 @@ yolk() {
 # WE START HERE
 #
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
-
-LIST="$CHROOT/etc/apt/sources.list"
-BACKUP="$LIST.backup"
-
-LIST_D="$LIST.d"
-BACKUP_D="$LIST_D.backup"
+YOLK_LIST="$CHROOT/etc/apt/sources.list.d/yolk.list"
 
 main "$1"
 

package/dist/classes/daddy.d.ts

@@ -11,8 +11,16 @@ export default class Daddy {
     settings: Settings;
     /**
      *
+     * @param reset
+     * @param isCustom
+     * @param fileCustom
+     * @param verbose
+     */
+    helpMe(reset?: boolean, isCustom?: boolean, fileCustom?: string, verbose?: boolean): Promise<void>;
+    /**
+     * editConfif
      * @param c
+     * @returns
      */
     editConfig(c: IEggsConfig): Promise<string>;
-    helpMe(loadDefault?: boolean, verbose?: boolean): Promise<void>;
 }

package/dist/classes/daddy.js

@@ -9,6 +9,8 @@ import chalk from 'chalk';
 import inquirer from 'inquirer';
 // _dirname
 import path from 'node:path';
+import fs from 'fs';
+import yaml from 'js-yaml';
 import Pacman from '../classes/pacman.js';
 import Settings from '../classes/settings.js';
 import Utils from '../classes/utils.js';
@@ -17,9 +19,92 @@ export default class Daddy {
     settings = {};
     /**
      *
+     * @param reset
+     * @param isCustom
+     * @param fileCustom
+     * @param verbose
+     */
+    async helpMe(reset = false, isCustom = false, fileCustom = '', verbose = false) {
+        console.log("reset: ", reset);
+        console.log("isCustom: ", isCustom);
+        if (isCustom) {
+            console.log("fileCustom: ", fileCustom);
+        }
+        // Controllo configurazione
+        if (!Pacman.configurationCheck()) {
+            console.log('- creating configuration dir...');
+            await Pacman.configurationInstall(verbose);
+        }
+        // Templates
+        if (!Pacman.distroTemplateCheck()) {
+            console.log('- distro template install...');
+            await Pacman.distroTemplateInstall(verbose);
+        }
+        // show and edit configuration
+        this.settings = new Settings();
+        let config = {};
+        let jsonConf = '';
+        if (await this.settings.load()) {
+            config = this.settings.config;
+            config.compression = 'fast';
+            if (reset) {
+                // Reset configuration
+                if (config.snapshot_prefix === '') {
+                    config.snapshot_prefix = Utils.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
+                }
+                jsonConf = JSON.stringify(config);
+                console.log("reset");
+            }
+            else if (isCustom) {
+                // Custom configuration
+                const conf = fs.readFileSync(fileCustom, 'utf8');
+                const confCustom = yaml.load(conf);
+                config.snapshot_basename = confCustom.snapshot_basename;
+                config.snapshot_prefix = confCustom.snapshot_prefix;
+                config.user_opt = confCustom.user_opt;
+                config.user_opt_passwd = confCustom.user_opt_passwd;
+                config.root_passwd = confCustom.root_passwd;
+                config.theme = confCustom.theme;
+                jsonConf = JSON.stringify(config);
+            }
+            else {
+                // default configuration
+                jsonConf = await this.editConfig(config);
+                console.log("edit");
+            }
+            // Save new configuration
+            const confNew = JSON.parse(jsonConf);
+            config.snapshot_basename = confNew.snapshot_basename;
+            config.snapshot_prefix = confNew.snapshot_prefix;
+            config.user_opt = confNew.user_opt;
+            config.user_opt_passwd = confNew.user_opt_passwd;
+            config.root_passwd = confNew.root_passwd;
+            config.theme = confNew.theme;
+            await this.settings.save(config);
+        }
+        console.log();
+        console.log(chalk.cyan('Your configuration was saved on: /etc/penguins-eggs.d'));
+        console.log();
+        console.log(chalk.cyan(`You can create a clean ISO with: `) + chalk.white(`sudo eggs produce`));
+        console.log(chalk.cyan(`or a full personal clone: `) + chalk.white(`sudo eggs produce --clone`));
+        console.log();
+        console.log(chalk.cyan(`If you don't have enough space to remaster, you can mount`));
+        console.log(chalk.cyan(`some remote or local space. Follow the samples:`));
+        console.log(chalk.cyan(`- first, create an hidden mountpoint under the nest:`));
+        console.log(chalk.white(`sudo mkdir /home/eggs/.mnt -p`));
+        console.log(chalk.cyan(`- then, mount remote space:`));
+        console.log(chalk.white(`sudo sshfs -o allow_other root@192.168.1.2:/zfs/iso /home/eggs/.mnt`));
+        console.log(chalk.cyan('- or, mount a local partition:'));
+        console.log(chalk.white(`sudo mount /dev/sdx1 /home/eggs/.mnt`));
+        console.log();
+        console.log(chalk.cyan('More help? ') + chalk.white('eggs mom'));
+    }
+    /**
+     * editConfif
      * @param c
+     * @returns
      */
-    editConfig(c) {
+    async editConfig(c) {
         // Utils.titles('dad')
         console.log(chalk.cyan('Edit and save Live system parameters'));
         console.log();
@@ -78,59 +163,4 @@ export default class Daddy {
             });
         });
     }
-    async helpMe(loadDefault = false, verbose = false) {
-        // Controllo configurazione
-        if (!Pacman.configurationCheck()) {
-            console.log('- creating configuration dir...');
-            await Pacman.configurationInstall(verbose);
-        }
-        // Templates
-        if (!Pacman.distroTemplateCheck()) {
-            console.log('- distro template install...');
-            await Pacman.distroTemplateInstall(verbose);
-        }
-        // show and edit configuration
-        this.settings = new Settings();
-        let config = {};
-        if (await this.settings.load()) {
-            config = this.settings.config;
-            let jsonConf;
-            if (loadDefault) {
-                if (config.snapshot_prefix === '') {
-                    config.snapshot_prefix = Utils.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
-                    config.compression = 'fast';
-                }
-                jsonConf = JSON.stringify(config);
-            }
-            else {
-                jsonConf = await this.editConfig(config);
-            }
-            const newConf = JSON.parse(jsonConf);
-            // salvo le modifiche
-            config.snapshot_basename = newConf.snapshot_basename;
-            config.snapshot_prefix = newConf.snapshot_prefix;
-            config.user_opt = newConf.user_opt;
-            config.user_opt_passwd = newConf.user_opt_passwd;
-            config.root_passwd = newConf.root_passwd;
-            config.theme = newConf.theme;
-            await this.settings.save(config);
-            console.log();
-            console.log(chalk.cyan('Your configuration was saved on: /etc/penguins-eggs.d'));
-            console.log();
-            console.log(chalk.cyan(`You can create a clean ISO with: `) + chalk.white(`sudo eggs produce`));
-            console.log(chalk.cyan(`or a full personal clone: `) + chalk.white(`sudo eggs produce --clone`));
-            console.log();
-            console.log(chalk.cyan(`If you don't have enough space to remaster, you can mount`));
-            console.log(chalk.cyan(`some remote or local space. Follow the samples:`));
-            console.log(chalk.cyan(`- first, create an hidden mountpoint under the nest:`));
-            console.log(chalk.white(`sudo mkdir /home/eggs/.mnt -p`));
-            console.log(chalk.cyan(`- then, mount remote space:`));
-            console.log(chalk.white(`sudo sshfs -o allow_other root@192.168.1.2:/zfs/iso /home/eggs/.mnt`));
-            console.log(chalk.cyan('- or, mount a local partition:'));
-            console.log(chalk.white(`sudo mount /dev/sdx1 /home/eggs/.mnt`));
-            console.log();
-            console.log(chalk.cyan('More help? ') + chalk.white('eggs mom'));
-            // await exec(`cat /etc/penguins-eggs.d/eggs.yaml`)
-        }
-    }
 }

package/dist/classes/n8.d.ts

@@ -5,8 +5,9 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+import { Dirent } from 'node:fs';
 export default class n8 {
-    static dirent2string(dir: any): string;
+    static dirent2string(dir: Dirent): string;
     /**
      *
      * @param dirPath

package/dist/classes/n8.js

@@ -8,6 +8,8 @@
 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;
@@ -17,24 +19,18 @@ export default class n8 {
      * @param dirPath
      */
     static isDirectory(name) {
-        // console.log (`isDirectory: ${name}`)
         const path = '/' + name;
         const isDirectory = fs.existsSync(path) && fs.lstatSync(path).isDirectory();
-        // console.log(`path: ${path} isDirectory: ${isDirectory}`)
         return isDirectory;
     }
     static isFile(name) {
-        // console.log (`isFile: ${name}`)
         const path = '/' + name;
         const isFile = fs.existsSync(path) && fs.lstatSync(path).isFile();
-        // console.log(`path: ${path} isFile: ${isFile}`)
         return isFile;
     }
     static isSymbolicLink(name) {
-        // console.log (`isSymbolicLink: ${name}`)
         const path = '/' + name;
         const isSymbolicLink = fs.existsSync(path) && fs.lstatSync(path).isSymbolicLink();
-        // console.log(`path: ${path} isSymbolicLink: ${isSymbolicLink}`)
         return isSymbolicLink;
     }
 }

package/dist/classes/network.d.ts

@@ -24,14 +24,14 @@ export default class Network {
     base(): string;
     bitmask(): void;
     broadcast(): string;
-    contains(): (address: string | number | Netmask) => boolean;
+    contains(): (address: string | Netmask | number) => boolean;
     first(): string;
     forEach(): (cb: (ip: string, long: number, index: number) => void) => void;
     hostmask(): string;
     last(): string;
     maskLong(): number;
     netLong(): number;
-    next(): (count?: number | undefined) => Netmask;
+    next(): (count?: number) => Netmask;
     size(): number;
     toString(): () => string;
 }

package/dist/classes/ovary.d.ts

@@ -26,6 +26,7 @@ export default class Ovary {
     snapshot_basename: string;
     snapshot_prefix: string;
     theme: string;
+    volid: string;
     toNull: string;
     verbose: boolean;
     /**
@@ -50,12 +51,6 @@ export default class Ovary {
      * @param verbose
      */
     cleanUsersAccounts(): Promise<void>;
-    /**
-     * copyBoot
-     *
-     * necessario: prima era merged
-     */
-    copyBoot(): Promise<void>;
     /**
      * list degli utenti: grep -E 1[0-9]{3}  /etc/passwd | sed s/:/\ / | awk '{print $1}'
      * create la home per user_opt

package/dist/classes/ovary.js

@@ -50,6 +50,7 @@ export default class Ovary {
     snapshot_basename = '';
     snapshot_prefix = '';
     theme = '';
+    volid = '';
     toNull = '';
     verbose = false;
     /**
@@ -89,7 +90,7 @@ export default class Ovary {
          * fs.readdirSync('/', { withFileTypes: true })
          * viene ignorato da Node8, ma da problemi da Node10 in poi
          */
-        const dirs = fs.readdirSync('/'); // we must remove boot and
+        const dirs = fs.readdirSync('/');
         const startLine = '#############################################################';
         const titleLine = '# -----------------------------------------------------------';
         const endLine = '# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n';
@@ -101,6 +102,10 @@ export default class Ovary {
         for (const dir of dirs) {
             cmds.push(startLine);
             if (N8.isDirectory(dir)) {
+                if (dir === 'boot') {
+                    cmds.push(`# /boot is copied actually`);
+                    cmds.push(await rexec(`cp -r /boot ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose));
+                }
                 if (dir !== 'boot' && dir !== 'lost+found') {
                     cmd = `# /${dir} is a directory`;
                     if (this.mergedAndOverlay(dir)) {
@@ -197,17 +202,6 @@ export default class Ovary {
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} userdel ${users[i]}`, this.verbose));
         }
     }
-    /**
-     * copyBoot
-     *
-     * necessario: prima era merged
-     */
-    async copyBoot() {
-        if (this.verbose) {
-            console.log('Ovary: copyBoot');
-        }
-        await rexec(`cp -r /boot ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose);
-    }
     /**
      * list degli utenti: grep -E 1[0-9]{3}  /etc/passwd | sed s/:/\ / | awk '{print $1}'
      * create la home per user_opt
@@ -639,6 +633,8 @@ export default class Ovary {
     async fertilization(snapshot_prefix = '', snapshot_basename = '', theme = '', compression = '', nointeratctive = false) {
         this.settings = new Settings();
         if (await this.settings.load()) {
+            await this.settings.loadRemix(this.theme);
+            this.volid = Utils.getVolid(this.settings.remix.name);
             this.familyId = this.settings.distro.familyId;
             this.nest = this.settings.config.snapshot_mnt;
             if (snapshot_prefix !== '') {
@@ -817,8 +813,7 @@ export default class Ovary {
         const { distroId } = this.settings.distro;
         let kp = `boot=live components locales=${process.env.LANG}`;
         if (this.familyId === 'archlinux') {
-            const volid = Utils.getVolid(this.settings.remix.name);
-            kp += isMiso(distroId) ? ` misobasedir=manjaro misolabel=${volid}` : ` archisobasedir=arch archisolabel=${volid}`;
+            kp += isMiso(distroId) ? ` misobasedir=manjaro misolabel=${this.volid}` : ` archisobasedir=arch archisolabel=${this.volid}`;
         }
         kp += ` cow_spacesize=4G`;
         return kp;
@@ -1100,6 +1095,10 @@ export default class Ovary {
             console.log('Ovary: makeIso');
         }
         Utils.writeX(`${this.settings.work_dir.ovarium}mkisofs`, cmd);
+        // Create link to iso ALLWAYES
+        const src = this.settings.config.snapshot_mnt + this.settings.isoFilename;
+        const dest = this.settings.config.snapshot_dir + this.settings.isoFilename;
+        await exec(`ln -s ${src} ${dest}`);
         if (!scriptOnly) {
             const test = (await exec(cmd, Utils.setEcho(true))).code;
             if (test !== 0) {
@@ -1297,7 +1296,6 @@ export default class Ovary {
         if (!fs.existsSync(this.settings.config.snapshot_dir)) {
             shx.mkdir('-p', this.settings.config.snapshot_dir);
         }
-        await this.settings.loadRemix(this.snapshot_basename, this.theme);
         if (Utils.isLive()) {
             console.log(chalk.red('>>> eggs: This is a live system! An egg cannot be produced from an egg!'));
         }
@@ -1422,7 +1420,6 @@ export default class Ovary {
                     await this.makeEfi(this.theme);
                 }
                 await this.bindLiveFs();
-                await this.copyBoot();
                 if (!this.clone) {
                     /**
                      * ANCHE per cryptedclone
@@ -1459,8 +1456,7 @@ export default class Ovary {
                 await exec(`mv ${luksFile} ${this.nest}iso/live`, this.echo);
             }
             const mkIsofsCmd = this.xorrisoCommand(clone, cryptedclone).replaceAll(/\s\s+/g, ' ');
-            const info = Utils.getVolid(this.settings.remix.name);
-            this.makeDotDisk(info, mksquashfsCmd, mkIsofsCmd);
+            this.makeDotDisk(this.volid, mksquashfsCmd, mkIsofsCmd);
             /**
              * AntiX/MX LINUX
              */
@@ -1644,7 +1640,6 @@ export default class Ovary {
         if (this.verbose) {
             console.log('Ovary: xorrisoCommand');
         }
-        const volid = Utils.getVolid(this.settings.remix.name);
         const prefix = this.settings.config.snapshot_prefix;
         let typology = '';
         // typology is applied only with standard egg-of
@@ -1660,7 +1655,7 @@ export default class Ovary {
             }
         }
         const postfix = Utils.getPostfix();
-        this.settings.isoFilename = prefix + volid + '_' + Utils.uefiArch() + typology + postfix;
+        this.settings.isoFilename = prefix + this.volid + '_' + Utils.uefiArch() + typology + postfix;
         //
         const output = this.settings.config.snapshot_mnt + this.settings.isoFilename;
         let command = '';
@@ -1688,28 +1683,7 @@ export default class Ovary {
             uefi_isohybridGptBasdat = '-isohybrid-gpt-basdat';
             uefi_noEmulBoot = '-no-emul-boot';
         }
-        // geniisoimage from Hosein
-        if (Pacman.packageIsInstalled('genisoimage')) {
-            command = `genisoimage \
-    -iso-level 3 \
-    -allow-limited-size \
-    -joliet-long \
-    -r \
-    -V "-V3.0" \
-    -cache-inodes \
-    -J \
-    -l \
-    -b isolinux/isolinux.bin \
-    -c isolinux/boot.cat \
-    -no-emul-boot \
-    -boot-load-size 4 \
-    -boot-info-table \
-    -eltorito-alt-boot \
-    -e boot/grub/efiboot.img \
-    -o ${output} ${this.settings.iso_work}`;
-            return command;
-        }
-        // xorriso from Piero
+        // xorriso
         command = `xorriso -as mkisofs \
      -J \
      -joliet-long \
@@ -1717,7 +1691,7 @@ export default class Ovary {
      -iso-level 3 \
      ${isoHybridMbr} \
      -partition_offset 16 \
-     -V ${volid} \
+     -V ${this.volid} \
      -b isolinux/isolinux.bin \
      -c isolinux/boot.cat \
      -no-emul-boot \

package/dist/classes/settings.d.ts

@@ -44,7 +44,7 @@ export default class Settings {
      * @param basename
      * @param theme
      */
-    loadRemix(basename?: string, theme?: string): Promise<void>;
+    loadRemix(theme?: string): Promise<void>;
     /**
      *
      * @param config

package/dist/classes/settings.js

@@ -164,7 +164,7 @@ export default class Settings {
      * @param basename
      * @param theme
      */
-    async loadRemix(basename = '', theme = '') {
+    async loadRemix(theme = '') {
         this.remix.versionNumber = Utils.getPackageVersion();
         this.remix.kernel = Utils.kernelVersion();
         this.remix.branding = theme === '' ? 'eggs' : (this.remix.branding = theme.slice(Math.max(0, theme.lastIndexOf('/') + 1)));

package/dist/commands/calamares.js

@@ -92,7 +92,7 @@ export default class Calamares extends Command {
                  */
                 if (await this.settings.load()) {
                     Utils.warning(`Configuring ${installer}`);
-                    await this.settings.loadRemix(this.settings.config.snapshot_basename, theme);
+                    await this.settings.loadRemix(theme);
                     const isClone = false;
                     this.incubator = new Incubator(this.settings.remix, this.settings.distro, this.settings.config.user_opt, theme, isClone, verbose);
                     await this.incubator.config(release);

package/dist/commands/dad.d.ts

@@ -13,6 +13,7 @@ export default class Dad extends Command {
         clean: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         default: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         help: import("@oclif/core/interfaces").BooleanFlag<void>;
+        file: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/dad.js

@@ -7,6 +7,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
+import fs from 'fs';
 import Daddy from '../classes/daddy.js';
 import Utils from '../classes/utils.js';
 import { exec } from '../lib/utils.js';
@@ -15,20 +16,30 @@ export default class Dad extends Command {
     static examples = ['sudo dad', 'sudo dad --clean', 'sudo dad --default'];
     static flags = {
         clean: Flags.boolean({ char: 'c', description: 'remove old configuration before to create' }),
-        default: Flags.boolean({ char: 'd', description: 'remove old configuration and force default' }),
+        default: Flags.boolean({ char: 'd', description: 'reset to default values' }),
         help: Flags.help({ char: 'h' }),
+        file: Flags.string({ char: 'f', description: 'use a file configuration custom' }),
         verbose: Flags.boolean({ char: 'v' })
     };
     async run() {
         Utils.titles(this.id + ' ' + this.argv);
         console.log(chalk.cyan('Daddy, what else did you leave for me?'));
         const { flags } = await this.parse(Dad);
+        const fileCustom = flags.file;
+        const isCustom = fileCustom !== undefined && fileCustom !== '';
+        const reset = flags.default;
         if (Utils.isRoot(this.id)) {
-            if (flags.clean || flags.default) {
+            if (flags.clean || flags.default || flags.mine) {
                 await exec('rm /etc/penguins-eggs.d -rf');
             }
+            if (isCustom) {
+                if (!fs.existsSync(fileCustom)) {
+                    console.log(chalk.red(`Custom configuration file: ${flags.custom} not found!`));
+                    process.exit(1);
+                }
+            }
             const daddy = new Daddy();
-            daddy.helpMe(flags.default, flags.verbose);
+            daddy.helpMe(reset, isCustom, fileCustom, flags.verbose);
         }
         else {
             Utils.useRoot(this.id);

package/dist/components/install.js

@@ -39,7 +39,7 @@ export default function Install({ message = "Install", percent = 0, spinner = fa
         React.createElement(Box, { width: 74, height: 11, borderStyle: "round", flexDirection: "column" },
             React.createElement(Box, { flexDirection: "column" },
                 React.createElement(Box, { flexDirection: "row" },
-                    React.createElement(Steps, { step: 9 }),
+                    React.createElement(Steps, { step: 8 }),
                     React.createElement(Box, { flexDirection: "column" },
                         React.createElement(Box, { flexDirection: "row" },
                             React.createElement(Text, null, "Installing: "),

package/dist/components/title.d.ts

@@ -5,7 +5,6 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-/// <reference types="react" />
 export default function Title({ title, version }: {
     title?: string | undefined;
     version?: string | undefined;

package/dist/krill/modules/network-cfg.js

@@ -6,6 +6,7 @@
  * license: MIT
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+import fs from 'fs';
 import Pacman from '../../classes/pacman.js';
 import Systemctl from '../../classes/systemctl.js';
 import Utils from '../../classes/utils.js';
@@ -37,10 +38,6 @@ export default async function networkCfg() {
             content += '    gateway ' + this.network.gateway + '\n';
         }
         Utils.write(file, content);
-        // trixie
-        // if (await systemdCtl.isActive('systemd-networkd.service')) {
-        //  await exec (`rm ${file}`)
-        // }
     }
     else if (this.distro.familyId === 'debian' && Pacman.packageIsInstalled('netplan.io')) {
         // netplan: to do
@@ -51,19 +48,17 @@ export default async function networkCfg() {
     /**
      * resolv.conf
      */
-    if (this.network.addressType === 'dhcp') {
-        if (await systemdCtl.isActive('resolvconf.service')) {
-            await exec(`rm ${this.installTarget}/etc/resolv.conf`);
-            await exec(`ln -s usr/lib/systemd/resolv.conf /etc/resolv.conf`);
-        }
-        else {
-            const file = this.installTarget + '/etc/resolv.conf';
-            let content = '# created by eggs\n\n';
-            content += 'domain ' + this.network.domain + '\n';
-            for (const element of this.network.dns) {
-                content += 'nameserver ' + element + '\n';
-            }
-            Utils.write(file, content);
+    const resolvFile = this.installTarget + '/etc/resolv.conf';
+    await exec(`rm -f ${resolvFile}`);
+    if (fs.existsSync('/run/systemd/resolve/resolv.conf')) {
+        await exec(`ln -s /run/systemd/resolve/resolv.conf ${resolvFile}`);
+    }
+    else {
+        let content = '# created by eggs\n\n';
+        content += 'domain ' + this.network.domain + '\n';
+        for (const element of this.network.dns) {
+            content += 'nameserver ' + element + '\n';
         }
+        Utils.write(resolvFile, content);
     }
 }

package/dist/krill/prepare.js

@@ -72,6 +72,7 @@ import Keyboard from '../components/keyboard.js';
 import Users from '../components/users.js';
 import Network from '../components/network.js';
 import Summary from '../components/summary.js';
+//import Install from '../components/install.js'
 import selectLanguages from '../lib/select_languages.js';
 import selectRegions from '../lib/select_regions.js';
 import selectZones from '../lib/select_zones.js';

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.7</h1>
+    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.10</h1>
     <h1>SYNOPSIS</h1>
     <p>Install Debian families (debian/devuan/ubuntu)</p>
-    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.7-bionic-1_amd64.deb
+    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.10-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.7  
+penguins-eggs/10.0.10  
 $ eggs --help [COMMAND]
 
 USAGE
@@ -204,12 +204,13 @@ EXAMPLES
     <h2><code>eggs dad</code></h2>
     <p>ask help from daddy - TUI configuration helper</p>
     <pre><code>USAGE
-  $ eggs dad [-c] [-d] [-h] [-v]
+  $ eggs dad [-c] [-d] [-h] [-f &#x3C;value>] [-v]
 
 FLAGS
-  -c, --clean    remove old configuration before to create
-  -d, --default  remove old configuration and force default
-  -h, --help     Show CLI help.
+  -c, --clean         remove old configuration before to create
+  -d, --default       reset to default values
+  -f, --file=&#x3C;value>  use a file configuration custom
+  -h, --help          Show CLI help.
   -v, --verbose
 
 DESCRIPTION

package/package.json

@@ -2,7 +2,7 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "10.0.7",
+  "version": "10.0.10",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
@@ -37,7 +37,7 @@
     "@types/mocha": "^10.0.6",
     "@types/mustache": "^4.2.5",
     "@types/netmask": "^2.0.5",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.7",
     "@types/node-static": "^0.7.11",
     "@types/react": "^18.3.3",
     "@types/shelljs": "^0.8.15",
@@ -52,7 +52,7 @@
     "prettier": "^3.3.2",
     "shx": "^0.3.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "engines": {
     "node": ">=16.0.0"

package/scripts/_eggs

@@ -246,8 +246,9 @@ _arguments -S \
 dad)
 _arguments -S \
 "(-c --clean)"{-c,--clean}"[remove old configuration before to create]" \
-"(-d --default)"{-d,--default}"[remove old configuration and force default]" \
+"(-d --default)"{-d,--default}"[reset to default values]" \
 "(-h --help)"{-h,--help}"[Show CLI help.]" \
+"(-f --file)"{-f,--file}"[use a file configuration custom]:file:_files" \
 "(-v --verbose)"{-v,--verbose}"[]" \
 --help"[Show help for command]" \
 "*: :_files" ;; 

package/scripts/eggs.bash

@@ -16,7 +16,7 @@ analyze --help --verbose
 calamares --help --install --nointeractive --policies --release --remove --theme --verbose
 config --clean --help --nointeractive --verbose
 cuckoo --help
-dad --clean --default --help --verbose
+dad --clean --default --help --file --verbose
 export:deb --all --clean --help --verbose
 export:iso --checksum --clean --help --verbose
 install --btrfs --chroot --crypted --domain --halt --help --ip --nointeractive --none --pve --random --small --suspend --unattended --verbose

package/scripts/resy

@@ -7,7 +7,7 @@ clear
 echo ">>> Re-install penguis-Eggs Saving Yolk"
 tmpDir=$(mktemp -d)
 mv /var/local/yolk "${tmpDir}"
-apt -y purge penguins-eggs
+apt-get -y purge penguins-eggs
 dpkg -i /tmp/penguins-eggs*.deb
 mv "${tmpDir}/yolk" /var/local
 eggs dad -d