penguins-eggs 10.0.10 → 10.0.12

package/.oclif.manifest.json

@@ -524,13 +524,16 @@
       "args": {},
       "description": "produce a live image from your system whithout your data",
       "examples": [
-        "sudo eggs produce",
-        "sudo eggs produce --max",
-        "sudo eggs produce --pendrive",
-        "sudo eggs produce --clone",
-        "sudo eggs produce --cryptedclone",
+        "sudo eggs produce                    # fast compression",
+        "sudo eggs produce --max              # max compression",
+        "sudo eggs produce --pendrive         # compression optomized pendrive",
+        "sudo eggs produce --clone            # clone",
+        "sudo eggs produce --cryptedclone     # crypted clone",
         "sudo eggs produce --basename=colibri",
-        "sudo eggs produce --basename=colibri --theme theme --addons adapt"
+        "sudo eggs produce --theme lastos",
+        "sudo eggs produce --excludes static  # you can customize it",
+        "sudo eggs produce --excludes homes   # exclude /home/*",
+        "sudo eggs produce --excludes home    # exclude ~/*"
       ],
       "flags": {
         "addons": {
@@ -562,7 +565,7 @@
           "type": "boolean"
         },
         "excludes": {
-          "description": "use: custom, home, mine, usr, var",
+          "description": "use: static, homes, home",
           "name": "excludes",
           "hasDynamicHelp": false,
           "multiple": true,
@@ -631,6 +634,13 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "sidecar": {
+          "description": "add a sidecar folder on your ISO with arbitrary contents",
+          "name": "sidecar",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "standard": {
           "char": "f",
           "description": "standard compression: xz -b 1M",
@@ -1458,5 +1468,5 @@
       ]
     }
   },
-  "version": "10.0.10"
+  "version": "10.0.12"
 }

package/README.md

@@ -27,7 +27,7 @@ penguins-eggs
 <!-- tocstop -->
 
 ## Links
-  * [Changelog](https://github.com/pieroproietti/penguins-eggs/blob/master/CHANGELOG.md)
+  * [Changelog](https://github.com/pieroproietti/penguins-eggs/blob/master/CHANGELOG.md#changelog)
   * [penguins' eggs user guide](https://penguins-eggs.net/docs/Tutorial/eggs-users-guide)
   * [Cook eggs in 5 minutes!](https://penguins-eggs.net/docs/Tutorial/eggs5)
   * [Wardrobe users' guide](https://penguins-eggs.net/docs/Tutorial/wardrobe-users-guide)
@@ -466,7 +466,7 @@ EXAMPLES
   $ eggs adapt
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/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.10/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/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.10/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/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.10/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/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.10/src/commands/cuckoo.ts)_
+_See code: [src/commands/cuckoo.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/cuckoo.ts)_
 
 ## `eggs dad`
 
@@ -626,7 +626,7 @@ EXAMPLES
   sudo dad --default
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -653,7 +653,7 @@ EXAMPLES
   $ eggs export deb --all
 ```
 
-_See code: [src/commands/export/deb.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/export/deb.ts)_
+_See code: [src/commands/export/deb.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/export/deb.ts)_
 
 ## `eggs export iso`
 
@@ -678,7 +678,7 @@ EXAMPLES
   $ eggs export iso --clean
 ```
 
-_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/export/iso.ts)_
+_See code: [src/commands/export/iso.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/export/iso.ts)_
 
 ## `eggs help [COMMAND]`
 
@@ -739,7 +739,7 @@ EXAMPLES
   sudo eggs install --chroot
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -762,7 +762,7 @@ EXAMPLES
   sudo eggs kill
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -821,7 +821,7 @@ EXAMPLES
   $ eggs mom
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -830,7 +830,8 @@ produce a live image from your system whithout your data
 ```
 USAGE
   $ eggs produce [--addons <value>...] [--basename <value>] [-c] [-C] [--excludes <value>...] [-h] [--links
-    <value>...] [-m] [-N] [-n] [-p] [-P <value>] [--release] [-s] [-f] [--theme <value>] [-u] [-v] [-y]
+    <value>...] [-m] [-N] [-n] [-p] [-P <value>] [--release] [-s] [--sidecar <value>] [-f] [--theme <value>] [-u] [-v]
+    [-y]
 
 FLAGS
   -C, --cryptedclone         crypted clone
@@ -848,31 +849,38 @@ FLAGS
   -y, --yolk                 force yolk renew
       --addons=<value>...    addons to be used: adapt, ichoice, pve, rsupport
       --basename=<value>     basename
-      --excludes=<value>...  use: custom, home, mine, usr, var
+      --excludes=<value>...  use: static, homes, home
       --links=<value>...     desktop links
       --release              release: remove penguins-eggs, calamares and dependencies after installation
+      --sidecar=<value>      add a sidecar folder on your ISO with arbitrary contents
       --theme=<value>        theme for livecd, calamares branding and partitions
 
 DESCRIPTION
   produce a live image from your system whithout your data
 
 EXAMPLES
-  sudo eggs produce
+  sudo eggs produce                    # fast compression
 
-  sudo eggs produce --max
+  sudo eggs produce --max              # max compression
 
-  sudo eggs produce --pendrive
+  sudo eggs produce --pendrive         # compression optomized pendrive
 
-  sudo eggs produce --clone
+  sudo eggs produce --clone            # clone
 
-  sudo eggs produce --cryptedclone
+  sudo eggs produce --cryptedclone     # crypted clone
 
   sudo eggs produce --basename=colibri
 
-  sudo eggs produce --basename=colibri --theme theme --addons adapt
+  sudo eggs produce --theme lastos
+
+  sudo eggs produce --excludes static  # you can customize it
+
+  sudo eggs produce --excludes homes   # exclude /home/*
+
+  sudo eggs produce --excludes home    # exclude ~/*
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/produce.ts)_
 
 ## `eggs status`
 
@@ -893,7 +901,7 @@ EXAMPLES
   $ eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/status.ts)_
 
 ## `eggs syncfrom`
 
@@ -919,7 +927,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.10/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -946,7 +954,7 @@ EXAMPLES
   sudo eggs syncto --excludes
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -968,7 +976,7 @@ EXAMPLES
   sudo eggs tools clean
 ```
 
-_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/clean.ts)_
+_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/tools/clean.ts)_
 
 ## `eggs tools ppa`
 
@@ -994,7 +1002,7 @@ EXAMPLES
   sudo eggs tools ppa --remove
 ```
 
-_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/ppa.ts)_
+_See code: [src/commands/tools/ppa.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/tools/ppa.ts)_
 
 ## `eggs tools skel`
 
@@ -1018,7 +1026,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.10/src/commands/tools/skel.ts)_
+_See code: [src/commands/tools/skel.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/tools/skel.ts)_
 
 ## `eggs tools stat`
 
@@ -1044,7 +1052,7 @@ EXAMPLES
   $ eggs tools stat --year
 ```
 
-_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/stat.ts)_
+_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/tools/stat.ts)_
 
 ## `eggs tools yolk`
 
@@ -1065,7 +1073,7 @@ EXAMPLES
   sudo eggs tools yolk
 ```
 
-_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/tools/yolk.ts)_
+_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/tools/yolk.ts)_
 
 ## `eggs update`
 
@@ -1086,7 +1094,7 @@ EXAMPLES
   $ eggs update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/update.ts)_
 
 ## `eggs version`
 
@@ -1132,7 +1140,7 @@ EXAMPLES
   $ eggs wardrobe get your-wardrobe
 ```
 
-_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/get.ts)_
+_See code: [src/commands/wardrobe/get.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/wardrobe/get.ts)_
 
 ## `eggs wardrobe list [REPO]`
 
@@ -1161,7 +1169,7 @@ EXAMPLES
   $ eggs wardrobe list --distro arch
 ```
 
-_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/list.ts)_
+_See code: [src/commands/wardrobe/list.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/wardrobe/list.ts)_
 
 ## `eggs wardrobe show [REPO]`
 
@@ -1191,7 +1199,7 @@ EXAMPLES
   $ eggs wardrobe show accessories/
 ```
 
-_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/show.ts)_
+_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/wardrobe/show.ts)_
 
 ## `eggs wardrobe wear [REPO]`
 
@@ -1222,7 +1230,7 @@ EXAMPLES
   sudo eggs wardrobe wear wagtail/waydroid
 ```
 
-_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.10/src/commands/wardrobe/wear.ts)_
+_See code: [src/commands/wardrobe/wear.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.12/src/commands/wardrobe/wear.ts)_
 <!-- commandsstop -->
 
 # penGUI

package/conf/exclude.list.d/{home.list → homes.list}

@@ -1,5 +1,5 @@
 ######################################################################################################
-# home: will be used just on:
+# homes: will be used just on:
 # * --clone included in exclude.list
 # * --cryptedclone used by syncto --excludes (automatically passed from ovary)
 # 

package/conf/exclude.list.d/master.list

@@ -78,12 +78,11 @@ lost+found
 swap/*
 swapfile
 
-{{{custom_list}}}
+{{{usr_list}}}
 
-{{{home_list}}}
+{{{var_list}}}
 
-{{{mine_list}}}
+{{{homes_list}}}
 
-{{{usr_list}}}
+{{{home_list}}}
 
-{{{var_list}}}

package/conf/exclude.list.d/var.list

@@ -3,9 +3,18 @@
 var/backups/*
 var/cache/* 
 var/lib/aide/*
+
+# look here for apt problem!
 var/lib/apt/*~
 var/lib/apt/cdroms.list
-var/lib/apt/lists/*
+var/lib/apt/daily_lock
+var/lib/apt/extended_states  
+var/lib/apt/listchanges.db  
+var/lib/apt/lists/
+var/lib/apt/mirrors/
+var/lib/apt/periodic/
+var/lib/apt/cache/*
+##
 var/lib/aptitude/*.old
 var/lib/cache/*
 var/lib/dbus/machine-id

package/dist/classes/ovary.d.ts

@@ -28,6 +28,7 @@ export default class Ovary {
     theme: string;
     volid: string;
     toNull: string;
+    sidecar: string;
     verbose: boolean;
     /**
      * Add or remove exclusion
@@ -158,7 +159,7 @@ export default class Ovary {
      * @param unsecure
      * @param verbose
      */
-    produce(clone: boolean | undefined, cryptedclone: boolean | undefined, scriptOnly: boolean | undefined, yolkRenew: boolean | undefined, release: boolean | undefined, myAddons: IAddons, myLinks: string[], excludes: IExcludes, nointeractive?: boolean, noicons?: boolean, unsecure?: boolean, verbose?: boolean): Promise<void>;
+    produce(clone: boolean | undefined, cryptedclone: boolean | undefined, scriptOnly: boolean | undefined, yolkRenew: boolean | undefined, release: boolean | undefined, myAddons: IAddons, myLinks: string[], excludes: IExcludes, nointeractive?: boolean, noicons?: boolean, unsecure?: boolean, sidecar?: string, verbose?: boolean): Promise<void>;
     /**
      * syslinux
      */
@@ -190,7 +191,7 @@ export default class Ovary {
      * @param cryptedclone
      * @returns cmd 4 mkiso
      */
-    xorrisoCommand(clone?: boolean, cryptedclone?: boolean): string;
+    xorrisoCommand(clone?: boolean, cryptedclone?: boolean): Promise<string>;
     /**
      * Creazione link desktop per lxde
      * @param name

package/dist/classes/ovary.js

@@ -52,6 +52,7 @@ export default class Ovary {
     theme = '';
     volid = '';
     toNull = '';
+    sidecar = '';
     verbose = false;
     /**
      * Add or remove exclusion
@@ -340,7 +341,10 @@ export default class Ovary {
             let text = '';
             text += '#!/bin/sh\n';
             text += 'DESKTOP=$(xdg-user-dir DESKTOP)\n';
-            text += 'test -d "$DESKTOP" && mkdir -p "$DESKTOP"\n';
+            text += 'while [ ! -d "$DESKTOP" ]; do\n';
+            text += '  DESKTOP=$(xdg-user-dir DESKTOP)\n';
+            text += '  sleep 1\n';
+            text += 'done\n';
             text += `cp /usr/share/applications/${installerUrl} "$DESKTOP"\n`;
             if (Pacman.packageIsInstalled('lxde-core')) {
                 if (!noicons) {
@@ -835,6 +839,14 @@ export default class Ovary {
             cmd = `cp ${path.resolve(__dirname, '../../conf/README.md')} ${this.settings.config.snapshot_dir}README.md`;
             this.tryCatch(cmd);
         }
+        // sidecar
+        if (this.sidecar !== '') {
+            this.sidecar = path.resolve(this.sidecar);
+            cmd = `mkdir -p ${this.settings.iso_work}sidecar`;
+            this.tryCatch(cmd);
+            cmd = `cp ${this.sidecar}/* ${this.settings.iso_work}sidecar -R`;
+            this.tryCatch(cmd);
+        }
         // Ovarium
         if (!fs.existsSync(this.settings.work_dir.ovarium)) {
             cmd = `mkdir -p ${this.settings.work_dir.ovarium}`;
@@ -1268,7 +1280,8 @@ export default class Ovary {
      * @param unsecure
      * @param verbose
      */
-    async produce(clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, myLinks, excludes, nointeractive = false, noicons = false, unsecure = false, verbose = false) {
+    async produce(clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, myLinks, excludes, nointeractive = false, noicons = false, unsecure = false, sidecar = '', verbose = false) {
+        this.sidecar = sidecar;
         this.verbose = verbose;
         this.echo = Utils.setEcho(verbose);
         if (this.verbose) {
@@ -1354,39 +1367,44 @@ export default class Ovary {
                 Utils.warning("eggs will REMOVE users and users' data from live");
             }
             /**
-             * create exclude.list in not exists or static
+             * exclude.list
              */
-            if (!fs.existsSync('/etc/penguins-eggs/exclude.list') || excludes.static) {
-                const excludeListTemplateDir = '/etc/penguins-eggs.d/exclude.list.d/';
-                const excludeListTemplate = excludeListTemplateDir + 'master.list';
-                if (!fs.existsSync(excludeListTemplate)) {
-                    Utils.warning('Cannot find: ' + excludeListTemplate);
-                    process.exit(1);
-                }
-                let excludeHome = '';
-                let excludeMine = '';
-                let excludeUsr = '';
-                let excludeVar = '';
-                if (excludes.mine) {
-                    excludeMine = `home/${await Utils.getPrimaryUser()}/*`;
-                }
-                if (excludes.home) {
-                    excludeHome = fs.readFileSync(`${excludeListTemplateDir}home.list`, 'utf8');
-                }
-                if (excludes.usr) {
-                    excludeUsr = fs.readFileSync(`${excludeListTemplateDir}usr.list`, 'utf8');
-                }
-                if (excludes.var) {
-                    excludeVar = fs.readFileSync(`${excludeListTemplateDir}var.list`, 'utf8');
+            if (!excludes.static) {
+                /**
+                 * create exclude.list if not exists
+                 */
+                if (!fs.existsSync('/etc/penguins-eggs/exclude.list')) {
+                    const excludeListTemplateDir = '/etc/penguins-eggs.d/exclude.list.d/';
+                    const excludeListTemplate = excludeListTemplateDir + 'master.list';
+                    if (!fs.existsSync(excludeListTemplate)) {
+                        Utils.warning('Cannot find: ' + excludeListTemplate);
+                        process.exit(1);
+                    }
+                    let excludeUsr = '';
+                    let excludeVar = '';
+                    let excludeHomes = '';
+                    let excludeHome = '';
+                    if (excludes.usr) {
+                        excludeUsr = fs.readFileSync(`${excludeListTemplateDir}usr.list`, 'utf8');
+                    }
+                    if (excludes.var) {
+                        excludeVar = fs.readFileSync(`${excludeListTemplateDir}var.list`, 'utf8');
+                    }
+                    if (excludes.homes) {
+                        excludeHomes = fs.readFileSync(`${excludeListTemplateDir}homes.list`, 'utf8');
+                    }
+                    if (excludes.home) {
+                        excludeHome = `home/${await Utils.getPrimaryUser()}/*`;
+                    }
+                    const view = {
+                        usr_list: excludeUsr,
+                        var_list: excludeVar,
+                        homes_list: excludeHomes,
+                        home_list: excludeHome,
+                    };
+                    const template = fs.readFileSync(excludeListTemplate, 'utf8');
+                    fs.writeFileSync(this.settings.config.snapshot_excludes, mustache.render(template, view));
                 }
-                const view = {
-                    home_list: excludeHome,
-                    mine_list: excludeMine,
-                    usr_list: excludeUsr,
-                    var_list: excludeVar
-                };
-                const template = fs.readFileSync(excludeListTemplate, 'utf8');
-                fs.writeFileSync(this.settings.config.snapshot_excludes, mustache.render(template, view));
             }
             /**
              * NOTE: reCreate = false
@@ -1455,7 +1473,7 @@ export default class Ovary {
                 Utils.warning(`moving ${luksFile} in ${this.nest}iso/live`);
                 await exec(`mv ${luksFile} ${this.nest}iso/live`, this.echo);
             }
-            const mkIsofsCmd = this.xorrisoCommand(clone, cryptedclone).replaceAll(/\s\s+/g, ' ');
+            const mkIsofsCmd = (await this.xorrisoCommand(clone, cryptedclone)).replaceAll(/\s\s+/g, ' ');
             this.makeDotDisk(this.volid, mksquashfsCmd, mkIsofsCmd);
             /**
              * AntiX/MX LINUX
@@ -1636,7 +1654,7 @@ export default class Ovary {
      * @param cryptedclone
      * @returns cmd 4 mkiso
      */
-    xorrisoCommand(clone = false, cryptedclone = false) {
+    async xorrisoCommand(clone = false, cryptedclone = false) {
         if (this.verbose) {
             console.log('Ovary: xorrisoCommand');
         }

package/dist/commands/produce.d.ts

@@ -24,6 +24,7 @@ export default class Produce extends Command {
         prefix: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         release: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         script: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        sidecar: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         standard: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         theme: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         unsecure: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/produce.js

@@ -18,20 +18,23 @@ const __dirname = path.dirname(new URL(import.meta.url).pathname);
 export default class Produce extends Command {
     static description = 'produce a live image from your system whithout your data';
     static examples = [
-        'sudo eggs produce',
-        'sudo eggs produce --max',
-        'sudo eggs produce --pendrive',
-        'sudo eggs produce --clone',
-        'sudo eggs produce --cryptedclone',
+        'sudo eggs produce                    # fast compression',
+        'sudo eggs produce --max              # max compression',
+        'sudo eggs produce --pendrive         # compression optomized pendrive',
+        'sudo eggs produce --clone            # clone',
+        'sudo eggs produce --cryptedclone     # crypted clone',
         'sudo eggs produce --basename=colibri',
-        'sudo eggs produce --basename=colibri --theme theme --addons adapt',
+        'sudo eggs produce --theme lastos',
+        'sudo eggs produce --excludes static  # you can customize it',
+        'sudo eggs produce --excludes homes   # exclude /home/*',
+        'sudo eggs produce --excludes home    # exclude ~/*',
     ];
     static flags = {
         addons: Flags.string({ description: 'addons to be used: adapt, ichoice, pve, rsupport', multiple: true }),
         basename: Flags.string({ description: 'basename' }),
         clone: Flags.boolean({ char: 'c', description: 'clone' }),
         cryptedclone: Flags.boolean({ char: 'C', description: 'crypted clone' }),
-        excludes: Flags.string({ description: 'use: custom, home, mine, usr, var', multiple: true }),
+        excludes: Flags.string({ description: 'use: static, homes, home', multiple: true }),
         help: Flags.help({ char: 'h' }),
         links: Flags.string({ description: 'desktop links', multiple: true }),
         max: Flags.boolean({ char: 'm', description: 'max compression: xz -Xbcj ...' }),
@@ -41,6 +44,7 @@ export default class Produce extends Command {
         prefix: Flags.string({ char: 'P', description: 'prefix' }),
         release: Flags.boolean({ description: 'release: remove penguins-eggs, calamares and dependencies after installation' }),
         script: Flags.boolean({ char: 's', description: 'script mode. Generate scripts to manage iso build' }),
+        sidecar: Flags.string({ description: 'add a sidecar folder on your ISO with arbitrary contents' }),
         standard: Flags.boolean({ char: 'f', description: 'standard compression: xz -b 1M' }),
         theme: Flags.string({ description: 'theme for livecd, calamares branding and partitions' }),
         unsecure: Flags.boolean({ char: 'u', description: '/root contents are included on live' }),
@@ -95,27 +99,21 @@ export default class Produce extends Command {
              */
             // excludes
             const excludes = {};
+            excludes.usr = true;
+            excludes.var = true;
             excludes.static = false;
+            excludes.homes = false;
             excludes.home = false;
-            excludes.mine = false;
-            excludes.usr = false;
-            excludes.var = false;
             if (flags.excludes) {
                 if (flags.excludes.includes('static')) {
                     excludes.static = true;
                 }
+                if (flags.excludes.includes('homes')) {
+                    excludes.homes = true;
+                }
                 if (flags.excludes.includes('home')) {
                     excludes.home = true;
                 }
-                if (flags.excludes.includes('mine')) {
-                    excludes.mine = true;
-                }
-                if (flags.excludes.includes('usr')) {
-                    excludes.usr = true;
-                }
-                if (flags.excludes.includes('var')) {
-                    excludes.var = true;
-                }
             }
             let prefix = '';
             if (flags.prefix !== undefined) {
@@ -145,6 +143,13 @@ export default class Produce extends Command {
             const yolkRenew = flags.yolk;
             const { nointeractive } = flags;
             const { noicon } = flags;
+            const { sidecar } = flags;
+            if (sidecar !== undefined) {
+                if (!fs.existsSync(sidecar)) {
+                    Utils.warning('sidecar: ' + chalk.white(sidecar) + ' not found!');
+                    process.exit();
+                }
+            }
             // if clone or cryptedclone unsecure = true
             const unsecure = flags.unsecure || clone || cryptedclone;
             /**
@@ -191,7 +196,7 @@ export default class Produce extends Command {
             const ovary = new Ovary();
             Utils.warning('Produce an egg...');
             if (await ovary.fertilization(prefix, basename, theme, compression, !nointeractive)) {
-                await ovary.produce(clone, cryptedclone, scriptOnly, yolkRenew, release, myAddons, myLinks, excludes, nointeractive, noicon, unsecure, verbose);
+                await ovary.produce(clone, cryptedclone, scriptOnly, yolkRenew, release, myAddons, myLinks, excludes, nointeractive, noicon, unsecure, sidecar, verbose);
                 ovary.finished(scriptOnly);
             }
         }

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

@@ -6,9 +6,9 @@
  * license: MIT
  */
 export interface IExcludes {
-    home: boolean;
-    mine: boolean;
     static: boolean;
+    homes: boolean;
+    home: boolean;
     usr: boolean;
     var: boolean;
 }

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.10</h1>
+    <h1>eggs(1) -- the reproductive system of penguins: eggs v10.0.12</h1>
     <h1>SYNOPSIS</h1>
     <p>Install Debian families (debian/devuan/ubuntu)</p>
-    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.10-1_i386.deb
+    <pre><code>$ sudo dpkg -i penguins-eggs_10.0.12-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.10  
+penguins-eggs/10.0.12  
 $ eggs --help [COMMAND]
 
 USAGE
@@ -382,7 +382,8 @@ EXAMPLES
     <p>produce a live image from your system whithout your data</p>
     <pre><code>USAGE
   $ eggs produce [--addons &#x3C;value>...] [--basename &#x3C;value>] [-c] [-C] [--excludes &#x3C;value>...] [-h] [--links
-    &#x3C;value>...] [-m] [-N] [-n] [-p] [-P &#x3C;value>] [--release] [-s] [-f] [--theme &#x3C;value>] [-u] [-v] [-y]
+    &#x3C;value>...] [-m] [-N] [-n] [-p] [-P &#x3C;value>] [--release] [-s] [--sidecar &#x3C;value>] [-f] [--theme &#x3C;value>] [-u] [-v]
+    [-y]
 
 FLAGS
   -C, --cryptedclone         crypted clone
@@ -400,28 +401,35 @@ FLAGS
   -y, --yolk                 force yolk renew
       --addons=&#x3C;value>...    addons to be used: adapt, ichoice, pve, rsupport
       --basename=&#x3C;value>     basename
-      --excludes=&#x3C;value>...  use: custom, home, mine, usr, var
+      --excludes=&#x3C;value>...  use: static, homes, home
       --links=&#x3C;value>...     desktop links
       --release              release: remove penguins-eggs, calamares and dependencies after installation
+      --sidecar=&#x3C;value>      add a sidecar folder on your ISO with arbitrary contents
       --theme=&#x3C;value>        theme for livecd, calamares branding and partitions
 
 DESCRIPTION
   produce a live image from your system whithout your data
 
 EXAMPLES
-  sudo eggs produce
+  sudo eggs produce                    # fast compression
 
-  sudo eggs produce --max
+  sudo eggs produce --max              # max compression
 
-  sudo eggs produce --pendrive
+  sudo eggs produce --pendrive         # compression optomized pendrive
 
-  sudo eggs produce --clone
+  sudo eggs produce --clone            # clone
 
-  sudo eggs produce --cryptedclone
+  sudo eggs produce --cryptedclone     # crypted clone
 
   sudo eggs produce --basename=colibri
 
-  sudo eggs produce --basename=colibri --theme theme --addons adapt
+  sudo eggs produce --theme lastos
+
+  sudo eggs produce --excludes static  # you can customize it
+
+  sudo eggs produce --excludes homes   # exclude /home/*
+
+  sudo eggs produce --excludes home    # exclude ~/*
 </code></pre>
     <h2><code>eggs status</code></h2>
     <p>informations about eggs status</p>

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.10",
+  "version": "10.0.12",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
@@ -48,7 +48,7 @@
     "eslint-config-prettier": "^9.1.0",
     "mocha": "^10.4.0",
     "oclif": "^4.13.8",
-    "perrisbrewery": "^9.8.6",
+    "perrisbrewery": "^10",
     "prettier": "^3.3.2",
     "shx": "^0.3.4",
     "ts-node": "^10.9.2",

package/scripts/_eggs

@@ -309,7 +309,7 @@ _arguments -S \
 --basename"[basename]:file:_files" \
 "(-c --clone)"{-c,--clone}"[clone]" \
 "(-C --cryptedclone)"{-C,--cryptedclone}"[crypted clone]" \
-"*"--excludes"[use: custom, home, mine, usr, var]:file:_files" \
+"*"--excludes"[use: static, homes, home]:file:_files" \
 "(-h --help)"{-h,--help}"[Show CLI help.]" \
 "*"--links"[desktop links]:file:_files" \
 "(-m --max)"{-m,--max}"[max compression: xz -Xbcj ...]" \
@@ -319,6 +319,7 @@ _arguments -S \
 "(-P --prefix)"{-P,--prefix}"[prefix]:file:_files" \
 --release"[release: remove penguins-eggs, calamares and dependencies after installation]" \
 "(-s --script)"{-s,--script}"[script mode. Generate scripts to manage iso build]" \
+--sidecar"[add a sidecar folder on your ISO with arbitrary contents]:file:_files" \
 "(-f --standard)"{-f,--standard}"[standard compression: xz -b 1M]" \
 --theme"[theme for livecd, calamares branding and partitions]:file:_files" \
 "(-u --unsecure)"{-u,--unsecure}"[/root contents are included on live]" \

package/scripts/eggs.bash

@@ -23,7 +23,7 @@ install --btrfs --chroot --crypted --domain --halt --help --ip --nointeractive -
 krill --btrfs --chroot --crypted --domain --halt --help --ip --nointeractive --none --pve --random --small --suspend --unattended --verbose
 kill --help --isos --nointeractive --verbose
 mom --help
-produce --addons --basename --clone --cryptedclone --excludes --help --links --max --noicon --nointeractive --pendrive --prefix --release --script --standard --theme --unsecure --verbose --yolk
+produce --addons --basename --clone --cryptedclone --excludes --help --links --max --noicon --nointeractive --pendrive --prefix --release --script --sidecar --standard --theme --unsecure --verbose --yolk
 status --help --verbose
 syncfrom --delete --file --help --rootdir --verbose
 syncto --excludes --file --help --verbose