penguins-eggs 9.0.31 → 9.0.35

package/README.md

@@ -133,7 +133,7 @@ $ npm install -g penguins-eggs
 $ eggs COMMAND
 running command...
 $ eggs (--version|-v)
-penguins-eggs/9.0.31 linux-x64 node-v16.14.0
+penguins-eggs/9.0.35 linux-x64 node-v16.14.0
 $ eggs --help [COMMAND]
 USAGE
   $ eggs COMMAND
@@ -189,7 +189,7 @@ ALIASES
   $ eggs adjust
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -210,7 +210,7 @@ EXAMPLES
   $ sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -256,7 +256,7 @@ DESCRIPTION
   bro: waydroid helper
 ```
 
-_See code: [src/commands/bro.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/bro.ts)_
+_See code: [src/commands/bro.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/bro.ts)_
 
 ## `eggs calamares`
 
@@ -285,7 +285,7 @@ EXAMPLES
   install calamares and create it's configuration's files
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -312,7 +312,7 @@ EXAMPLES
   Configure and install prerequisites deb packages to run it
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/config.ts)_
 
 ## `eggs dad`
 
@@ -332,7 +332,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -423,7 +423,7 @@ DESCRIPTION
   re-thinking for a different approach to CLI
 ```
 
-_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/info.ts)_
 
 ## `eggs install`
 
@@ -452,7 +452,7 @@ EXAMPLES
   Install the system using GUI or CLI installer
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -474,7 +474,7 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/kill.ts)_
 
 ## `eggs mom`
 
@@ -491,7 +491,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -556,7 +556,7 @@ EXAMPLES
   in /home/eggs/ovarium and you can customize all you need
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/produce.ts)_
 
 ## `eggs remove`
 
@@ -586,7 +586,7 @@ EXAMPLES
   remove eggs, eggs configurations, packages dependencies
 ```
 
-_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/remove.ts)_
+_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/remove.ts)_
 
 ## `eggs syncfrom`
 
@@ -594,13 +594,14 @@ Restore users, server and datas from luks-eggs-backup
 
 ```
 USAGE
-  $ eggs syncfrom [-f <value>] [-r <value>] [-h] [-v]
+  $ eggs syncfrom [--delete <value>] [-f <value>] [-r <value>] [-h] [-v]
 
 FLAGS
-  -f, --file=<value>     file with LUKS volume encrypted
+  -f, --file=<value>     file LUKS volume encrypted
   -h, --help             Show CLI help.
   -r, --rootdir=<value>  rootdir of the installed system, when used from live
   -v, --verbose          verbose
+  --delete=<value>       rsync --delete delete extraneous files from dest dirs
 
 DESCRIPTION
   Restore users, server and datas from luks-eggs-backup
@@ -612,7 +613,7 @@ EXAMPLES
   $ sudo eggs restore
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -620,13 +621,13 @@ Backup users, server and datas to luks-eggs-backup
 
 ```
 USAGE
-  $ eggs syncto [-k] [-f <value>] [-h] [-v]
+  $ eggs syncto [--delete <value>] [-f <value>] [-h] [-v]
 
 FLAGS
   -f, --file=<value>  file LUKS volume encrypted
   -h, --help          Show CLI help.
-  -k, --krill         krill
   -v, --verbose       verbose
+  --delete=<value>    rsync --delete delete extraneous files from dest dirs
 
 DESCRIPTION
   Backup users, server and datas to luks-eggs-backup
@@ -635,10 +636,10 @@ ALIASES
   $ eggs backup
 
 EXAMPLES
-  $ sudo eggs restore
+  $ sudo eggs syncto
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -761,7 +762,7 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.31/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.35/src/commands/update.ts)_
 
 ## `eggs version`
 

package/lib/classes/daddy.js

@@ -46,7 +46,7 @@ class Daddy {
             }
             else {
                 if (config.snapshot_prefix === '') {
-                    config.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.versionId);
+                    config.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
                     config.compression = 'fast';
                 }
                 jsonConf = JSON.stringify(config);
@@ -148,7 +148,7 @@ class Daddy {
             compressionOpt = 2;
         }
         if (c.snapshot_prefix === '') {
-            c.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.versionId);
+            c.snapshot_prefix = utils_1.default.snapshotPrefix(this.settings.distro.distroId, this.settings.distro.codenameId);
         }
         return new Promise(function (resolve) {
             const questions = [

package/lib/classes/distro.d.ts

@@ -12,8 +12,10 @@ declare class Distro implements IDistro {
     familyId: string;
     distroId: string;
     distroLike: string;
-    versionId: string;
-    versionLike: string;
+    codenameId: string;
+    codenameLikeId: string;
+    releaseId: string;
+    releaseLike: string;
     usrLibPath: string;
     isolinuxPath: string;
     syslinuxPath: string;

package/lib/classes/distro.js

@@ -41,8 +41,10 @@ class Distro {
         this.familyId = 'debian';
         this.distroId = '';
         this.distroLike = '';
-        this.versionId = '';
-        this.versionLike = '';
+        this.codenameId = '';
+        this.codenameLikeId = '';
+        this.releaseId = '';
+        this.releaseLike = '';
         this.usrLibPath = '/usr/lib';
         this.isolinuxPath = '';
         this.syslinuxPath = '';
@@ -81,170 +83,152 @@ class Distro {
         /**
          * lsb_release -cs per versione ed lsb_release -is per distribuzione
          */
-        this.versionId = shelljs_1.default.exec('lsb_release -cs', { silent: true }).stdout.toString().trim();
+        this.codenameId = shelljs_1.default.exec('lsb_release -cs', { silent: true }).stdout.toString().trim();
+        this.releaseId = shelljs_1.default.exec('lsb_release -rs', { silent: true }).stdout.toString().trim();
         this.distroId = shelljs_1.default.exec('lsb_release -is', { silent: true }).stdout.toString().trim();
         /**
-         * Per casi equivoci conviene normalizzare versionId
+         * releaseLike = releaseId
          */
-        switch (this.versionId) {
-            case 'n/a': {
-                // può essere Deepin apricot
-                if (this.distroId === 'Deepin') {
-                    this.versionId = 'apricot';
-                }
-                else if (node_fs_1.default.existsSync('/etc/debian_version')) {
-                    // bookworm?
-                    const debianVersion = node_fs_1.default.readFileSync('/etc/debian_version', 'utf8');
-                    if (debianVersion.trim() === 'bookworm/sid') {
-                        this.versionId = 'bookworm';
-                    }
-                }
-                break;
-            }
-            case 'sid': {
-                // sinora ho trovato solo siduction
-                if (node_fs_1.default.existsSync('/etc/debian_version')) {
-                    const debianVersion = node_fs_1.default.readFileSync('/etc/debian_version', 'utf8');
-                    if (debianVersion.trim() === 'bullseye/sid') {
-                        this.versionId = 'siduction';
-                    }
-                }
-                break;
-            }
-            case 'testing': {
-                if (this.distroId === 'Netrunner') {
-                    this.versionId = 'buster/sid';
-                }
-                break;
-            }
-            // No default
+        this.releaseLike = this.releaseId;
+        /**
+         * Per casi equivoci conviene normalizzare codenameId
+         *  -i, --id           show distributor ID
+         *  -r, --release      show release number of this distribution
+         *  -c, --codename     show code name of this distribution
+         */
+        if (this.distroId === 'Debian' && this.releaseId === 'unstable' && this.codenameId === 'sid') {
+            this.codenameId = 'bookworm';
         }
-        // Procedo analizzanto solo versionId...
-        // prima Debian, Devuan ed Ubuntu
-        switch (this.versionId) {
+        else if (this.distroId === 'Debian' && this.releaseId === 'testing/unstable') {
+            this.codenameId = 'bookworm';
+            this.releaseLike = 'unstable';
+        }
+        /**
+         * Procedo analizzanto: codenameId, prima Debian, Devuan ed Ubuntu poi gli altri
+         */
+        switch (this.codenameId) {
             case 'jessie': {
                 // Debian 8 jessie
                 this.distroLike = 'Debian';
-                this.versionLike = 'jessie';
+                this.codenameLikeId = 'jessie';
                 break;
             }
             case 'stretch': {
                 // Debian 9 stretch
                 this.distroLike = 'Debian';
-                this.versionLike = 'stretch';
+                this.codenameLikeId = 'stretch';
                 break;
             }
             case 'buster': {
                 // Debian 10 buster
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 break;
             }
             case 'bullseye': {
                 // Debian 11 bullseye
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'bookworm': {
                 // Debian 11 bullseye
                 this.distroLike = 'Debian';
-                this.versionLike = 'bookworm';
+                this.codenameLikeId = 'bookworm';
                 break;
             }
             case 'beowulf': {
                 this.distroLike = 'Devuan';
-                this.versionLike = 'beowulf';
+                this.codenameLikeId = 'beowulf';
                 break;
             }
             case 'chimaera': {
                 this.distroLike = 'Devuan';
-                this.versionLike = 'chimaera';
+                this.codenameLikeId = 'chimaera';
                 break;
             }
             case 'daedalus': {
                 this.distroLike = 'Devuan';
-                this.versionLike = 'daedalus';
+                this.codenameLikeId = 'daedalus';
                 break;
             }
             case 'xenial': {
                 // Ubuntu xenial
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'xenial';
+                this.codenameLikeId = 'xenial';
                 break;
             }
             case 'bionic': {
                 // Ubuntu 18.04 bionic LTS eol aprile 2023
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'bionic';
+                this.codenameLikeId = 'bionic';
                 break;
             }
             case 'focal': {
                 // Ubuntu 20.04 focal LTS
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'groovy': {
                 // Ubuntu 20.10 groovy
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'groovy';
+                this.codenameLikeId = 'groovy';
                 break;
             }
             case 'hirsute': {
                 // Ubuntu 21.04 hirsute
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'hirsute';
+                this.codenameLikeId = 'hirsute';
                 break;
             }
             case 'impish': {
                 // Ubuntu 21.10 impish
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'impish';
+                this.codenameLikeId = 'impish';
                 break;
             }
             case 'jammy': {
                 // Ubuntu 22.04 jammy
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'jammy';
+                this.codenameLikeId = 'jammy';
                 // quindi le derivate...
                 break;
             }
             case 'kali-rolling': {
                 // Kali
                 this.distroLike = 'Debian';
-                this.versionLike = 'bookworm';
-                // UfficioZero roma
+                this.codenameLikeId = 'bookworm';
                 break;
             }
             case `jolnir`: {
                 // Elementary
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'roma': {
                 // UfficioZero roma
                 this.distroLike = 'Devuan';
-                this.versionLike = 'beowulf';
+                this.codenameLikeId = 'beowulf';
                 break;
             }
             case 'tropea': {
                 // UfficioZero tropea
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'vieste': {
                 // UfficioZero tropea
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'bionic';
+                this.codenameLikeId = 'bionic';
                 break;
             }
             case 'siena': {
                 // UfficioZero siena
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 break;
             }
             case 'tara':
@@ -253,7 +237,7 @@ class Distro {
             case 'tricia': {
                 // LinuxMint 19.x
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'bionic';
+                this.codenameLikeId = 'bionic';
                 break;
             }
             case 'ulyana':
@@ -262,37 +246,37 @@ class Distro {
             case 'una': {
                 // LinuxMint 20.x
                 this.distroLike = 'Ubuntu';
-                this.versionLike = 'focal';
+                this.codenameLikeId = 'focal';
                 break;
             }
             case 'debbie': {
                 // LMDE 4 debbie
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 break;
             }
             case 'elsie': {
                 // LMDE 5 elsie
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'apricot': {
                 // Deepin 20 apricot
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'siduction': {
                 // Debian 11 Siduction
                 this.distroLike = 'Debian';
-                this.versionLike = 'bullseye';
+                this.codenameLikeId = 'bullseye';
                 break;
             }
             case 'buster/sid': {
                 // Netrunner
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
                 /**
                  * ArchLinux
                  */
@@ -304,13 +288,13 @@ class Distro {
             case 'Harpy-Eagle': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
-                this.versionLike = 'rolling';
+                this.codenameLikeId = 'rolling';
                 break;
             }
             case 'White-tailed-eagle': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
-                this.versionLike = 'rolling';
+                this.codenameLikeId = 'rolling';
                 break;
             }
             /**
@@ -319,7 +303,7 @@ class Distro {
             case 'Qonos': {
                 this.familyId = 'archlinux';
                 this.distroLike = 'Arch';
-                this.versionLike = 'rolling';
+                this.codenameLikeId = 'rolling';
                 break;
                 /**
                  * Fedora
@@ -328,7 +312,7 @@ class Distro {
             case 'ThirtyFive': {
                 this.familyId = 'fedora';
                 this.distroLike = 'Fedora';
-                this.versionLike = 'thirtyfive';
+                this.codenameLikeId = 'thirtyfive';
                 break;
                 /**
                  * openSuse
@@ -337,8 +321,8 @@ class Distro {
             case 'tumbleweed': {
                 this.familyId = 'suse';
                 this.distroLike = 'SUSE';
-                this.versionId = 'tumbleweed';
-                this.versionLike = 'tumbleweed';
+                this.codenameId = 'tumbleweed';
+                this.codenameLikeId = 'tumbleweed';
                 break;
             }
             default: {
@@ -347,13 +331,13 @@ class Distro {
                  */
                 console.log("This distro is not yet recognized, I'll try Debian buster");
                 this.distroLike = 'Debian';
-                this.versionLike = 'buster';
+                this.codenameLikeId = 'buster';
             }
         }
         /**
          * Selezione il mountpoint per squashfs
          */
-        if (this.versionLike === 'jessie' || this.versionLike === 'stretch' || this.versionLike === 'bionic' || this.versionLike === 'xenial') {
+        if (this.codenameLikeId === 'jessie' || this.codenameLikeId === 'stretch' || this.codenameLikeId === 'bionic' || this.codenameLikeId === 'xenial') {
             this.mountpointSquashFs = '/lib/live/mount/medium/live/filesystem.squashfs';
         }
         else {

package/lib/classes/family/debian.js

@@ -24,7 +24,7 @@ class Debian {
      */
     static isInstalledXorg() {
         let test = 'xserver-xorg-core';
-        if (pacman_1.default.distro().versionLike === 'bionic') {
+        if (pacman_1.default.distro().codenameLikeId === 'bionic') {
             /**
              * BUT_ on Ubuntu bionic we have:
              * xserver-xorg-core-hwe-18.04
@@ -69,7 +69,7 @@ class Debian {
             }
         }
         // Version e initType da controllare
-        const version = pacman_1.default.distro().versionLike;
+        const version = pacman_1.default.distro().codenameLikeId;
         for (const dep of dependencies_1.depVersions) {
             if (dep.versions.includes(version)) {
                 if (!this.packageIsInstalled(dep.package)) {

package/lib/classes/i18n.js

@@ -46,7 +46,7 @@ class I18n {
         if (this.verbose) {
             console.log('creating /etc/default.locale');
         }
-        const src = node_path_1.default.resolve(__dirname, `../../conf/distros/${this.settings.distro.versionId}/locales/locale.template`);
+        const src = node_path_1.default.resolve(__dirname, `../../conf/distros/${this.settings.distro.codenameId}/locales/locale.template`);
         const dest = '/etc/default/locale';
         const template = node_fs_1.default.readFileSync(src, 'utf8');
         const view = {
@@ -59,7 +59,7 @@ class I18n {
         if (this.verbose) {
             console.log('creating /etc/locale.gen');
         }
-        const srcLocales = node_path_1.default.resolve(__dirname, `../../conf/distros/${this.settings.distro.versionId}/locales/locale.gen.template`);
+        const srcLocales = node_path_1.default.resolve(__dirname, `../../conf/distros/${this.settings.distro.codenameId}/locales/locale.gen.template`);
         const destLocales = '/etc/locale.gen';
         const templateLocales = node_fs_1.default.readFileSync(srcLocales, 'utf8');
         const viewLocales = { locales: [{}] };

package/lib/classes/incubation/fisherman-helper/packages.js

@@ -60,7 +60,7 @@ function tryInstall(distro) {
     // Pacchetti da installare sempre
     text += `    - hunspell-${lang}\n`;
     // Pacchetti da installare a seconda della distribuzione
-    if (distro.versionLike === 'focal' || distro.versionLike === 'bionic') {
+    if (distro.codenameLikeId === 'focal' || distro.codenameLikeId === 'bionic') {
         text += `    - language-pack-${lang}\n`;
     }
     // Pacchetti da installare se sono presenti

package/lib/classes/incubation/incubator.js

@@ -48,7 +48,7 @@ class Incubator {
         const echo = utils_1.default.setEcho(verbose);
         this.createInstallerDirs();
         // DEBIAN
-        switch (this.distro.versionLike) {
+        switch (this.distro.codenameLikeId) {
             case 'jessie': {
                 const jessie = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
                 await jessie.create();

package/lib/classes/incubation/installer.d.ts

@@ -6,7 +6,7 @@
  * modules = configuration + 'modules/'
  * modulesMultiarch = '/usr/lib/' + arch-linux-gnu + '/' + installer + '/'
  *
- * template = '/etc/penguins-eggs/' + .distro.versionLike + '/' + installer + '/'
+ * template = '/etc/penguins-eggs/' + .distro.codenameLikeId + '/' + installer + '/'
  * templateModules = template + '/modules/'
  * templateMultiarch = template + installer + '-modules/'
  *

package/lib/classes/incubation/installer.js

@@ -24,12 +24,12 @@ function installer() {
     const remix = {};
     const distro = new distro_1.default(remix);
     if (distro.isCalamaresAvailable) {
-        installer.template = '/etc/penguins-eggs.d/distros/' + distro.versionLike + '/calamares/';
+        installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/calamares/';
         installer.templateModules = installer.template + 'modules/';
         installer.templateMultiarch = installer.template + 'calamares-modules/';
     }
     else {
-        installer.template = '/etc/penguins-eggs.d/distros/' + distro.versionLike + '/krill/';
+        installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/krill/';
         installer.templateModules = installer.template + 'modules/';
         installer.templateMultiarch = installer.template + 'krill-modules/';
     }

package/lib/classes/krill_install.d.ts

@@ -11,6 +11,7 @@
       - partition OK
       - mount this.mountFs, this.mountVfs OK
       - unpackfs OK
+      - Restore private data from backup
       - sources-yolk // call execCalamaresModule('sources-yolk')
       - machineid OK
       - fstab OK