penguins-eggs 10.0.8 → 10.0.12

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",
@@ -516,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": {
@@ -554,7 +565,7 @@
           "type": "boolean"
         },
         "excludes": {
-          "description": "use: custom, home, mine, usr, var",
+          "description": "use: static, homes, home",
           "name": "excludes",
           "hasDynamicHelp": false,
           "multiple": true,
@@ -623,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",
@@ -1450,5 +1468,5 @@
       ]
     }
   },
-  "version": "10.0.8"
+  "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.8/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.8/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.8/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.8/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.8/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`
 
@@ -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.8/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`
 
@@ -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.8/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`
 
@@ -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.8/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]`
 
@@ -738,7 +739,7 @@ EXAMPLES
   sudo eggs install --chroot
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -761,7 +762,7 @@ EXAMPLES
   sudo eggs kill
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -820,7 +821,7 @@ EXAMPLES
   $ eggs mom
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -829,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
@@ -847,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.8/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`
 
@@ -892,7 +901,7 @@ EXAMPLES
   $ eggs status
 ```
 
-_See code: [src/commands/status.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -918,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.8/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`
 
@@ -945,7 +954,7 @@ EXAMPLES
   sudo eggs syncto --excludes
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -967,7 +976,7 @@ EXAMPLES
   sudo eggs tools clean
 ```
 
-_See code: [src/commands/tools/clean.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -993,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.8/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`
 
@@ -1017,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.8/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`
 
@@ -1043,7 +1052,7 @@ EXAMPLES
   $ eggs tools stat --year
 ```
 
-_See code: [src/commands/tools/stat.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -1064,7 +1073,7 @@ EXAMPLES
   sudo eggs tools yolk
 ```
 
-_See code: [src/commands/tools/yolk.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -1085,7 +1094,7 @@ EXAMPLES
   $ eggs update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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`
 
@@ -1131,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.8/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]`
 
@@ -1160,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.8/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]`
 
@@ -1190,7 +1199,7 @@ EXAMPLES
   $ eggs wardrobe show accessories/
 ```
 
-_See code: [src/commands/wardrobe/show.ts](https://github.com/pieroproietti/penguins-eggs/blob/v10.0.8/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]`
 
@@ -1221,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.8/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/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/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/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>;
 }