penguins-eggs 10.0.7 → 10.0.8

package/.oclif.manifest.json

@@ -1450,5 +1450,5 @@
       ]
     }
   },
-  "version": "10.0.7"
+  "version": "10.0.8"
 }

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.8/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.8/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.8/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.8/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.8/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -625,7 +625,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.8/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -652,7 +652,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.8/src/commands/export/deb.ts)_
 
 ## `eggs export iso`
 
@@ -677,7 +677,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.8/src/commands/export/iso.ts)_
 
 ## `eggs help [COMMAND]`
 
@@ -738,7 +738,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.8/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -761,7 +761,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.8/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -820,7 +820,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.8/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -871,7 +871,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.8/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -892,7 +892,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.8/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -918,7 +918,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.8/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -945,7 +945,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.8/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -967,7 +967,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.8/src/commands/tools/clean.ts)_
 
 ## `eggs tools ppa`
 
@@ -993,7 +993,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.8/src/commands/tools/ppa.ts)_
 
 ## `eggs tools skel`
 
@@ -1017,7 +1017,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.8/src/commands/tools/skel.ts)_
 
 ## `eggs tools stat`
 
@@ -1043,7 +1043,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.8/src/commands/tools/stat.ts)_
 
 ## `eggs tools yolk`
 
@@ -1064,7 +1064,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.8/src/commands/tools/yolk.ts)_
 
 ## `eggs update`
 
@@ -1085,7 +1085,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.8/src/commands/update.ts)_
 
 ## `eggs version`
 
@@ -1131,7 +1131,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.8/src/commands/wardrobe/get.ts)_
 
 ## `eggs wardrobe list [REPO]`
 
@@ -1160,7 +1160,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.8/src/commands/wardrobe/list.ts)_
 
 ## `eggs wardrobe show [REPO]`
 
@@ -1190,7 +1190,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.8/src/commands/wardrobe/show.ts)_
 
 ## `eggs wardrobe wear [REPO]`
 
@@ -1221,7 +1221,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.8/src/commands/wardrobe/wear.ts)_
 <!-- commandsstop -->
 
 # penGUI

package/dist/classes/n8.d.ts

@@ -5,8 +5,10 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
+/// <reference types="node" resolution-mode="require"/>
+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/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/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.8</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.8-bionic-1_amd64.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.8  
 $ eggs --help [COMMAND]
 
 USAGE

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.8",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"