penguins-eggs 9.3.24 → 9.3.26

package/dist/classes/ovary.js

@@ -50,11 +50,12 @@ class Ovary {
         this.compression = '';
         this.theme = '';
         this.clone = false;
+        this.cryptedclone = false;
     }
     /**
      * @returns {boolean} success
      */
-    async fertilization(snapshot_prefix = '', snapshot_basename = '', theme = '', compression = '', notinteratctive = false) {
+    async fertilization(snapshot_prefix = '', snapshot_basename = '', theme = '', compression = '', nointeratctive = false) {
         this.settings = new settings_1.default();
         if (await this.settings.load()) {
             this.familyId = this.settings.distro.familyId;
@@ -70,7 +71,7 @@ class Ovary {
             if (compression !== '') {
                 this.settings.config.compression = compression;
             }
-            if (!notinteratctive) {
+            if (!nointeratctive) {
                 return true;
             }
             this.settings.listFreeSpace();
@@ -84,15 +85,18 @@ class Ovary {
      *
      * @param basename
      */
-    async produce(backup = false, clone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, nointeractive = false, verbose = false) {
+    async produce(clone = false, cryptedclone = false, scriptOnly = false, yolkRenew = false, release = false, myAddons, nointeractive = false, verbose = false) {
         this.verbose = verbose;
-        this.clone = clone;
         this.echo = utils_2.default.setEcho(verbose);
         if (this.verbose) {
             this.toNull = ' > /dev/null 2>&1';
         }
-        let luksName = 'luks-eggs-backup';
+        this.clone = clone;
+        this.cryptedclone = cryptedclone;
+        let luksName = 'luks-eggs-data';
         let luksFile = `/tmp/${luksName}`;
+        // let luksDevice = `/dev/mapper/${this.luksName}`
+        // let luksMountpoint = `/mnt`
         if (this.familyId === 'debian') {
             const yolk = new yolk_1.default();
             if (!yolk.yolkExists()) {
@@ -117,15 +121,18 @@ class Ovary {
         }
         else {
             await this.liveCreateStructure();
-            if (this.settings.distro.isCalamaresAvailable && (pacman_1.default.isInstalledGui()) && this.settings.config.force_installer && !(await pacman_1.default.calamaresCheck())) {
-                console.log('Installing ' + chalk_1.default.bgGray('calamares') + ' due force_installer=yes.');
-                await pacman_1.default.calamaresInstall(verbose);
-                const bleach = new bleach_1.default();
-                await bleach.clean(verbose);
-            }
-            // BACKUP
-            if (backup) {
-                console.log(`Follow users' data and accounts will be saved in a crypted LUKS volume:`);
+            if (!nointeractive) {
+                if (this.settings.distro.isCalamaresAvailable && (pacman_1.default.isInstalledGui()) &&
+                    this.settings.config.force_installer && !(await pacman_1.default.calamaresCheck())) {
+                    console.log('Installing ' + chalk_1.default.bgGray('calamares') + ' due force_installer=yes.');
+                    await pacman_1.default.calamaresInstall(verbose);
+                    const bleach = new bleach_1.default();
+                    await bleach.clean(verbose);
+                }
+            }
+            // CRYPTEDCLONE
+            if (cryptedclone) {
+                console.log(`Users and the user data will be saved in an encrypted LUKS volume`);
                 const users = await this.usersFill();
                 for (let i = 0; i < users.length; i++) {
                     if (users[i].saveIt) {
@@ -142,11 +149,11 @@ class Ovary {
                 // CLONE
             }
             else if (this.clone) {
-                utils_2.default.warning('eggs will SAVE yours users accounts and datas UNCRYPTED on the live');
+                utils_2.default.warning('eggs will SAVE users and users\' data UNCRYPTED on the live');
                 // NORMAL
             }
             else {
-                utils_2.default.warning('eggs will REMOVE users accounts and datas from live');
+                utils_2.default.warning('eggs will REMOVE users and users\' from live');
             }
             /**
              * NOTE: reCreate = false
@@ -155,10 +162,7 @@ class Ovary {
              * put reCreate = true in release
              */
             let reCreate = true;
-            if (reCreate) { // start pre-backup
-                if (this.clone) {
-                    await (0, utils_1.exec)(`touch ${this.settings.config.snapshot_dir}ovarium/iso/live/is-clone.md`, this.echo);
-                }
+            if (reCreate) { // start pre-clone
                 /**
                  * Anche non accettando l'installazione di calamares
                  * viene creata la configurazione dell'installer: krill/calamares
@@ -183,16 +187,12 @@ class Ovary {
                     await this.makeEfi(this.theme);
                 }
                 await this.bindLiveFs();
-                /**
-                 * clone
-                 */
-                if (this.clone) {
-                    await (0, utils_1.exec)(`touch ${this.settings.config.snapshot_dir}ovarium/iso/live/is-clone.md`, this.echo);
-                }
-                else {
+                if (!this.clone) {
+                    /**
+                     * ANCHE per cryptedclone
+                     */
                     await this.cleanUsersAccounts();
                     await this.createUserLive();
-                    // create XdgAutostart
                     if (pacman_1.default.isInstalledGui()) {
                         await this.createXdgAutostart(this.settings.config.theme, myAddons);
                         /**
@@ -209,18 +209,18 @@ class Ovary {
                     // Here we are forcing alwats cliAutologin
                     cliAutologin.addAutologin(this.settings.distro.distroId, this.settings.distro.codenameId, this.settings.config.user_opt, this.settings.config.user_opt_passwd, this.settings.config.root_passwd, this.settings.work_dir.merged);
                 }
-                await this.editLiveFs();
+                await this.editLiveFs(clone, cryptedclone);
                 await this.makeSquashfs(scriptOnly);
                 await this.uBindLiveFs(); // Lo smonto prima della fase di backup
             }
-            if (backup) {
+            if (cryptedclone) {
                 await (0, utils_1.exec)('eggs syncto', utils_2.default.setEcho(true));
                 utils_2.default.warning(`Waiting 10s, before to move ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
                 await (0, utils_1.exec)('sleep 10', utils_2.default.setEcho(false));
                 utils_2.default.warning(`moving ${luksFile} in ${this.settings.config.snapshot_dir}ovarium/iso/live`);
                 await (0, utils_1.exec)(`mv ${luksFile} ${this.settings.config.snapshot_dir}ovarium/iso/live`, this.echo);
             }
-            const xorrisoCommand = this.makeDotDisk(backup);
+            const xorrisoCommand = this.makeDotDisk(clone, cryptedclone);
             /**
              * patch to emulate miso/archiso on archilinux
              */
@@ -311,10 +311,27 @@ class Ovary {
      * - Add some basic files to /dev
      * - Clear configs from /etc/network/interfaces, wicd and NetworkManager and netman
      */
-    async editLiveFs() {
+    async editLiveFs(clone = false, cryptedclone = false) {
         if (this.verbose) {
             console.log('ovary: editLiveFs');
         }
+        /**
+         * new is_clone written just on live
+         */
+        if (clone) {
+            await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/penguins-eggs.d/is_clone`, this.echo);
+        }
+        if (cryptedclone) {
+            await (0, utils_1.exec)(`touch ${this.settings.work_dir.merged}/etc/penguins-eggs.d/is_crypted_clone`, this.echo);
+        }
+        /**
+         * add epoptes server just on live
+         */
+        if (pacman_1.default.packageIsInstalled('epoptes')) {
+            const file = `${this.settings.work_dir.merged}/etc/default/epoptes-client`;
+            const text = `SERVER=${node_os_1.default.hostname}.local\n`;
+            fs_1.default.writeFileSync(file, text);
+        }
         if (this.familyId === 'debian') {
             // Aggiungo UMASK=0077 in /etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf
             const text = 'UMASK=0077\n';
@@ -1070,20 +1087,16 @@ class Ovary {
          * configuro add-penguins-desktop-icons in /etc/xdg/autostart
          */
         const dirAutostart = `${this.settings.work_dir.merged}/etc/xdg/autostart`;
-        const dirRun = '/usr/bin';
         if (fs_1.default.existsSync(dirAutostart)) {
             // Creo l'avviatore xdg DEVE essere add-penguins-links.desktop
             shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/penguins-links-add.desktop'), dirAutostart);
-            // Creo lo script add-penguins-links.sh
-            const script = `${dirRun}/penguins-links-add.sh`;
+            // create /usr/bin/penguins-links-add.sh
+            const script = `/usr/bin/penguins-links-add.sh`;
             let text = '';
             text += '#!/bin/sh\n';
             text += 'DESKTOP=$(xdg-user-dir DESKTOP)\n';
-            text += '# Create ~/Desktop just in case this runs before the xdg folder creation script\n';
-            text += 'mkdir -p $DESKTOP\n';
-            // Anche se in lxde rimane il problema della conferma dell'avvio
-            // per l'installer, lo tolgo altrimenti su LXDE riappare comunque
-            text += `cp /usr/share/applications/${installerUrl} $DESKTOP\n`;
+            text += 'test -d "$DESKTOP" && mkdir -p "$DESKTOP"\n';
+            text += `cp /usr/share/applications/${installerUrl} "$DESKTOP"\n`;
             if (pacman_1.default.packageIsInstalled('lxde-core')) {
                 text += this.lxdeLink('penguins-eggs.desktop', "penguin's eggs", 'eggs');
                 if (myAddons.adapt)
@@ -1094,29 +1107,29 @@ class Ovary {
                     text += this.lxdeLink('eggs-rsupport.desktop', 'Remote assistance', 'remote-assistance');
             }
             else {
-                text += 'cp /usr/share/applications/penguins-eggs.desktop $DESKTOP\n';
+                text += `cp /usr/share/applications/penguins-eggs.desktop "$DESKTOP"\n`;
                 if (myAddons.adapt)
-                    text += 'cp /usr/share/applications/eggs-adapt.desktop $DESKTOP\n';
+                    text += `cp /usr/share/applications/eggs-adapt.desktop "$DESKTOP"\n`;
                 if (myAddons.pve)
-                    text += 'cp /usr/share/applications/eggs-pve.desktop $DESKTOP\n';
+                    text += `cp /usr/share/applications/eggs-pve.desktop "$DESKTOP"\n`;
                 if (myAddons.rsupport)
-                    text += 'cp /usr/share/applications/eggs-rsupport.desktop $DESKTOP\n';
+                    text += `cp /usr/share/applications/eggs-rsupport.desktop "$DESKTOP"\n`;
             }
             /**
              * enable desktop links
              */
             if (pacman_1.default.packageIsInstalled('gdm3') || pacman_1.default.packageIsInstalled('gdm')) {
                 // GNOME
-                text += `test -f /usr/share/applications/penguins-eggs.desktop && cp /usr/share/applications/penguins-eggs.desktop $DESKTOP\n`;
-                text += `test -f "$DESKTOP/penguins-eggs.desktop" && chmod a+x "$DESKTOP/penguins-eggs.desktop"\n`;
-                text += `test -f "$DESKTOP/penguins-eggs.desktop" && gio set "$DESKTOP/penguins-eggs.desktop" metadata::trusted true\n`;
-                text += `test -f /usr/share/applications/install-debian.desktop && cp /usr/share/applications/install-debian.desktop $DESKTOP\n`;
-                text += `test -f "$DESKTOP/install-debian.desktop" && chmod a+x $DESKTOP/install-debian.desktop\n`;
-                text += `test -f "$DESKTOP/install-debian.desktop" && gio set "$DESKTOP/install-debian.desktop" metadata::trusted true\n`;
+                text += `test -f /usr/share/applications/penguins-eggs.desktop && cp /usr/share/applications/penguins-eggs.desktop "$DESKTOP"\n`;
+                text += `test -f "$DESKTOP"/penguins-eggs.desktop && chmod a+x "$DESKTOP"/penguins-eggs.desktop\n`;
+                text += `test -f "$DESKTOP"/penguins-eggs.desktop && gio set "$DESKTOP"/penguins-eggs.desktop metadata::trusted true\n`;
+                text += `test -f /usr/share/applications/${installerUrl} && cp /usr/share/applications/${installerUrl} "$DESKTOP"\n`;
+                text += `test -f "$DESKTOP"/${installerUrl} && chmod a+x "$DESKTOP"/${installerUrl}\n`;
+                text += `test -f "$DESKTOP"/${installerUrl} && gio set "$DESKTOP"/${installerUrl} metadata::trusted true\n`;
             }
             else {
                 // OTHERS: CINNAMON/KDE/ETC
-                text += `chmod +x $DESKTOP/*.desktop`;
+                text += `chmod +x "$DESKTOP"/*.desktop`;
             }
             fs_1.default.writeFileSync(script, text, 'utf8');
             await (0, utils_1.exec)(`chmod a+x ${script}`, this.echo);
@@ -1355,7 +1368,7 @@ class Ovary {
      * create .disk/info, .disk/mksquashfs, .disk/mkiso
      * return mkiso
      */
-    makeDotDisk(backup = false) {
+    makeDotDisk(clone = false, cryptedclone = false) {
         const dotDisk = this.settings.work_dir.pathIso + '/.disk';
         if (fs_1.default.existsSync(dotDisk)) {
             shelljs_1.default.rm('-rf', dotDisk);
@@ -1369,24 +1382,31 @@ class Ovary {
         const scripts = this.settings.work_dir.path;
         shelljs_1.default.cp(scripts + '/mksquashfs', dotDisk + '/mksquashfs');
         // .disk/mkisofs
-        content = this.xorrisoCommand(backup).replace(/\s\s+/g, ' ');
+        content = this.xorrisoCommand(clone, cryptedclone).replace(/\s\s+/g, ' ');
         file = dotDisk + '/mkisofs';
         fs_1.default.writeFileSync(file, content, 'utf-8');
         return content;
     }
     /**
      *
-     * @param backup
+     * @param cryptedclone
      * @returns cmd 4 mkiso
      */
-    xorrisoCommand(backup = false) {
+    xorrisoCommand(clone = false, cryptedclone = false) {
         const volid = utils_2.default.getVolid(this.settings.remix.name);
         let prefix = this.settings.config.snapshot_prefix;
-        if (backup) {
-            prefix = prefix.slice(0, 7) === 'egg-of-' ? 'egg-eb-' + prefix.slice(7) : 'egg-eb-' + prefix;
+        let typology = "";
+        // typology is applied only with standard egg-of
+        if (prefix.slice(0, 7) === 'egg-of-') {
+            if (clone) {
+                typology = "_clone";
+            }
+            else if (cryptedclone) {
+                typology = "_crypted";
+            }
         }
         const postfix = utils_2.default.getPostfix();
-        this.settings.isoFilename = prefix + volid + postfix;
+        this.settings.isoFilename = prefix + volid + typology + postfix;
         const output = this.settings.config.snapshot_dir + this.settings.isoFilename;
         let command = '';
         // const appid = `-appid "${this.settings.distro.distroId}" `

package/dist/classes/pxe.js

@@ -176,7 +176,7 @@ class Pxe {
         content += `\n`;
         content += `menu title cuckoo: when you need a flying PXE server! ${utils_1.default.address()}\n`;
         content += `PROMPT 0\n`;
-        content += `TIMEOUT 0\n`;
+        content += `TIMEOUT 200\n`;
         content += `\n`;
         content += `label egg\n`;
         content += `menu label ${this.bootLabel.replace('.iso', '')}\n`;

package/dist/classes/tools.js

@@ -10,7 +10,6 @@ const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const settings_1 = tslib_1.__importDefault(require("./settings"));
-const utils_1 = tslib_1.__importDefault(require("./utils"));
 /**
  * Utils: general porpourse utils
  * @remarks all the utilities
@@ -46,7 +45,7 @@ class Tools {
             const settings = new settings_1.default();
             settings.load();
             this.snapshot_dir = settings.config.snapshot_dir;
-            this.snapshot_name = settings.config.snapshot_prefix + settings.config.snapshot_basename + '-' + utils_1.default.machineArch() + '_';
+            this.snapshot_name = settings.config.snapshot_prefix + settings.config.snapshot_basename + '_'; // + Utils.machineArch() + '_'
         }
         else {
             console.log(`Can't find: ${this.tools_yaml}`);

package/dist/classes/utils.js

@@ -347,7 +347,7 @@ class Utils {
      * @returns eggName
      */
     static getPostfix() {
-        let postfix = '-' + this.machineArch() + '_' + Utils.formatDate(new Date()) + '.iso';
+        let postfix = '_' + this.machineArch() + '_' + Utils.formatDate(new Date()) + '.iso';
         return postfix;
     }
     /**

package/dist/commands/calamares.js

@@ -43,6 +43,7 @@ class Calamares extends core_1.Command {
         if (flags.theme !== undefined) {
             theme = flags.theme;
         }
+        let nointeractive = flags.nointeractive;
         console.log(`theme: ${theme}`);
         if (utils_1.default.isRoot(this.id)) {
             let installer = 'krill';
@@ -51,7 +52,7 @@ class Calamares extends core_1.Command {
             }
             if (installer === 'calamares') {
                 if (!remove) {
-                    if (await utils_1.default.customConfirm('Select yes to continue...')) {
+                    if (!nointeractive || await utils_1.default.customConfirm('Select yes to continue...')) {
                         /**
                          * Install calamares
                          */
@@ -102,6 +103,7 @@ exports.default = Calamares;
 Calamares.flags = {
     help: core_1.Flags.help({ char: 'h' }),
     install: core_1.Flags.boolean({ char: 'i', description: "install calamares and it's dependencies" }),
+    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
     release: core_1.Flags.boolean({ char: 'r', description: "release: remove calamares and all it's dependencies after the installation" }),
     remove: core_1.Flags.boolean({ description: "remove calamares and it's dependencies" }),
     theme: core_1.Flags.string({ description: 'theme/branding for eggs and calamares' }),

package/dist/commands/config.js

@@ -67,17 +67,18 @@ class Config extends core_1.Command {
      *
      * @param verbose
      */
-    static async thatWeNeed(nointeractive = false, verbose = false, backup = false) {
+    static async thatWeNeed(nointeractive = false, verbose = false, cryptedclone = false) {
         const i = {};
         i.distroTemplate = !pacman_1.default.distroTemplateCheck();
         if (utils_1.default.machineArch() !== 'i386') {
             i.efi = !pacman_1.default.isUefi();
         }
-        if (!backup) {
+        if (!cryptedclone) {
             if (!(await pacman_1.default.calamaresCheck()) && pacman_1.default.isInstalledGui() && pacman_1.default.isCalamaresAvailable()) {
                 if (!pacman_1.default.packageIsInstalled('live-installer')) {
-                    utils_1.default.warning('config: you are on a graphic system, I suggest to install the GUI installer calamares');
-                    i.calamares = nointeractive ? true : await utils_1.default.customConfirm('Want You install calamares?');
+                    utils_1.default.warning('Config: you are on a graphic system, I suggest to install the GUI installer calamares');
+                    // se nointeractive i.calamares=false
+                    i.calamares = nointeractive ? false : await utils_1.default.customConfirm('Want You install calamares?');
                 }
             }
         }
@@ -209,12 +210,12 @@ exports.default = Config;
 Config.flags = {
     clean: core_1.Flags.boolean({ char: 'c', description: 'remove old configuration before to create new one' }),
     help: core_1.Flags.help({ char: 'h' }),
-    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'assume yes' }),
+    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' })
 };
 Config.description = 'Configure and install prerequisites deb packages to run it';
 Config.examples = [
     "sudo eggs config",
     "sudo eggs config --clean",
-    "sudo eggs config --clean --noninteractive"
+    "sudo eggs config --clean --nointeractive"
 ];

package/dist/commands/export/iso.js

@@ -16,9 +16,6 @@ class ExportIso extends core_1.Command {
         const Tu = new tools_1.default();
         await Tu.loadSettings();
         const echo = utils_1.default.setEcho(flags.verbose);
-        if (flags.backup) {
-            Tu.snapshot_name = Tu.snapshot_name.slice(0, 7) === 'egg-of-' ? 'egg-eb-' + Tu.snapshot_name.slice(7) : 'backup-' + Tu.snapshot_name;
-        }
         const rmount = `/tmp/eggs-${(Math.random() + 1).toString(36).substring(7)}`;
         let cmd = `rm -f ${rmount}\n`;
         let filter = '*.iso';
@@ -42,7 +39,6 @@ class ExportIso extends core_1.Command {
 }
 exports.default = ExportIso;
 ExportIso.flags = {
-    backup: core_1.Flags.boolean({ char: 'b', description: 'export backup ISOs' }),
     clean: core_1.Flags.boolean({ char: 'c', description: 'delete old ISOs before to copy' }),
     help: core_1.Flags.help({ char: 'h' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' })
@@ -51,5 +47,4 @@ ExportIso.description = 'export iso in the destination host';
 ExportIso.examples = [
     "eggs export iso",
     "eggs export iso --clean",
-    "eggs export iso --backup"
 ];

package/dist/commands/install.js

@@ -49,8 +49,8 @@ class Install extends core_1.Command {
                 krillConfig = js_yaml_1.default.load(content);
             });
         }
-        // noninteractive
-        let noninteractive = flags.nointeractive;
+        // nointeractive
+        let nointeractive = flags.nointeractive;
         // hostname
         let ip = flags.ip;
         let random = flags.random;
@@ -71,7 +71,7 @@ class Install extends core_1.Command {
         if (utils_1.default.isRoot()) {
             if (utils_1.default.isLive()) {
                 const krill = new krill_prepare_1.default();
-                await krill.prepare(unattended, noninteractive, krillConfig, ip, random, domain, suspend, small, none, crypted, pve, verbose);
+                await krill.prepare(unattended, nointeractive, krillConfig, ip, random, domain, suspend, small, none, crypted, pve, verbose);
             }
             else {
                 utils_1.default.warning('You are in an installed system!');
@@ -89,7 +89,7 @@ Install.flags = {
     domain: core_1.Flags.string({ char: 'd', description: 'Domain name, defult: .local' }),
     help: core_1.Flags.help({ char: 'h' }),
     ip: core_1.Flags.boolean({ char: 'i', description: 'hostname as ip, eg: ip-192-168-1-33' }),
-    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'assume yes' }),
+    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
     none: core_1.Flags.boolean({ char: 'N', description: 'Swap none: 256M' }),
     pve: core_1.Flags.boolean({ char: 'p', description: 'Proxmox VE install' }),
     random: core_1.Flags.boolean({ char: 'r', description: 'Add random to hostname, eg: colibri-ay412dt' }),

package/dist/commands/kill.js

@@ -19,19 +19,20 @@ class Kill extends core_1.Command {
         this.work_dir = {};
     }
     async run() {
-        await utils_1.default.titles(this.id + ' ' + this.argv);
+        utils_1.default.titles(this.id + ' ' + this.argv);
         const { flags } = await this.parse(Kill);
         let verbose = false;
         if (flags.verbose) {
             verbose = true;
         }
+        let nointeractive = flags.nointeractive;
         const echo = utils_1.default.setEcho(verbose);
         if (utils_1.default.isRoot()) {
             // Utils.warning('Cleaning the nest...')
             const settings = new settings_1.default();
             await settings.load();
             await settings.listFreeSpace();
-            if (await utils_1.default.customConfirm()) {
+            if (nointeractive || await utils_1.default.customConfirm()) {
                 await (0, utils_2.exec)(`rm ${settings.work_dir.path}/* -rf`, echo);
                 await (0, utils_2.exec)(`rm ${settings.config.snapshot_dir} -rf`, echo);
             }
@@ -44,6 +45,7 @@ class Kill extends core_1.Command {
 exports.default = Kill;
 Kill.flags = {
     help: core_1.Flags.help({ char: 'h' }),
+    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' })
 };
 Kill.description = 'kill the eggs/free the nest';

package/dist/commands/produce.js

@@ -58,18 +58,15 @@ class Produce extends core_1.Command {
             }
             const compressors = new compressors_1.default();
             await compressors.populate();
-            let compression = compressors.normal();
+            let compression = compressors.fast();
             if (flags.max) {
                 compression = compressors.max();
             }
-            else if (flags.fast) {
-                compression = compressors.fast();
+            else if (flags.standard) {
+                compression = compressors.normal();
             }
             const release = flags.release;
-            // if (release) {
-            // compression = compressors.max()
-            // }
-            const backup = flags.backup;
+            const cryptedclone = flags.cryptedclone;
             const clone = flags.clone;
             const verbose = flags.verbose;
             const scriptOnly = flags.script;
@@ -91,9 +88,9 @@ class Produce extends core_1.Command {
                     }
                 }
             }
-            const i = await config_1.default.thatWeNeed(nointeractive, verbose, backup);
+            const i = await config_1.default.thatWeNeed(nointeractive, verbose, cryptedclone);
             if ((i.needApt || i.configurationInstall || i.configurationRefresh || i.distroTemplate) && (await utils_1.default.customConfirm('Select yes to continue...'))) {
-                await config_1.default.install(i, verbose);
+                await config_1.default.install(i, nointeractive, verbose);
             }
             const myAddons = {};
             if (flags.addons != undefined) {
@@ -114,7 +111,7 @@ class Produce extends core_1.Command {
             const ovary = new ovary_1.default();
             utils_1.default.warning('Produce an egg...');
             if (await ovary.fertilization(prefix, basename, theme, compression, !nointeractive)) {
-                await ovary.produce(backup, clone, scriptOnly, yolkRenew, release, myAddons, nointeractive, verbose);
+                await ovary.produce(clone, cryptedclone, scriptOnly, yolkRenew, release, myAddons, nointeractive, verbose);
                 ovary.finished(scriptOnly);
             }
         }
@@ -126,16 +123,16 @@ class Produce extends core_1.Command {
 exports.default = Produce;
 Produce.flags = {
     addons: core_1.Flags.string({ multiple: true, description: 'addons to be used: adapt, ichoice, pve, rsupport' }),
-    backup: core_1.Flags.boolean({ char: 'b', description: 'backup mode (CRYPTED)' }),
     basename: core_1.Flags.string({ description: 'basename' }),
-    clone: core_1.Flags.boolean({ char: 'c', description: 'clone mode' }),
-    fast: core_1.Flags.boolean({ char: 'f', description: 'fast compression' }),
+    clone: core_1.Flags.boolean({ char: 'c', description: 'clone' }),
+    cryptedclone: core_1.Flags.boolean({ char: 'C', description: 'crypted clone' }),
     help: core_1.Flags.help({ char: 'h' }),
     max: core_1.Flags.boolean({ char: 'm', description: 'max compression' }),
-    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'don\'t ask for user interctions' }),
+    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
     prefix: core_1.Flags.string({ char: 'p', description: 'prefix' }),
     release: core_1.Flags.boolean({ description: 'release: max compression, remove penguins-eggs and calamares after installation' }),
     script: core_1.Flags.boolean({ char: 's', description: 'script mode. Generate scripts to manage iso build' }),
+    standard: core_1.Flags.boolean({ char: 'f', description: 'standard compression' }),
     theme: core_1.Flags.string({ description: 'theme for livecd, calamares branding and partitions' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
     yolk: core_1.Flags.boolean({ char: 'y', description: '-y force yolk renew' }),
@@ -143,10 +140,11 @@ Produce.flags = {
 Produce.description = 'produce a live image from your system whithout your data';
 Produce.examples = [
     "sudo eggs produce",
-    "sudo eggs produce --fast",
+    "sudo eggs produce --standard",
     "sudo eggs produce --max",
-    "sudo eggs produce --fast --basename=colibri",
-    "sudo eggs produce --fast --basename=colibri --theme /path/to/theme --addons adapt",
-    "sudo eggs produce --fast --clone",
-    "sudo eggs produce --fast --backup",
+    "sudo eggs produce --max --basename=colibri",
+    "sudo eggs produce --cryptedclone",
+    "sudo eggs produce --clone",
+    "sudo eggs produce --basename=colibri",
+    "sudo eggs produce --basename=colibri --theme /path/to/theme --addons adapt",
 ];

package/dist/commands/syncfrom.js

@@ -21,10 +21,10 @@ class Syncfrom extends core_1.Command {
         this.verbose = false;
         this.echo = {};
         this.rootDir = '/';
-        this.luksName = 'luks-eggs-backup';
+        this.luksName = 'luks-eggs-data';
         this.luksFile = `/run/live/medium/live/${this.luksName}`;
         this.luksDevice = `/dev/mapper/${this.luksName}`;
-        this.luksMountpoint = '/tmp/eggs-backup';
+        this.luksMountpoint = '/tmp/eggs-data';
     }
     async run() {
         const { flags } = await this.parse(Syncfrom);
@@ -50,7 +50,7 @@ class Syncfrom extends core_1.Command {
         }
         if (utils_1.default.isRoot()) {
             if (fileVolume === '') {
-                fileVolume = '/run/live/medium/live/luks-eggs-backup';
+                fileVolume = '/run/live/medium/live/luks-eggs-dada';
             }
             if (!utils_1.default.isLive()) {
                 /**
@@ -60,7 +60,7 @@ class Syncfrom extends core_1.Command {
                     this.luksName = path_1.default.basename(fileVolume);
                     this.luksFile = fileVolume;
                     this.luksDevice = `/dev/mapper/${this.luksName}`;
-                    this.luksMountpoint = '/tmp/eggs-backup';
+                    this.luksMountpoint = '/tmp/eggs-data';
                     await this.restorePrivateData();
                     if (await utils_1.default.customConfirm(`Your system was updated! Press a key to reboot`)) {
                         await (0, utils_2.exec)('reboot');
@@ -77,7 +77,7 @@ class Syncfrom extends core_1.Command {
                 this.luksName = path_1.default.basename(fileVolume);
                 this.luksFile = fileVolume;
                 this.luksDevice = `/dev/mapper/${this.luksName}`;
-                this.luksMountpoint = '/tmp/eggs-backup';
+                this.luksMountpoint = '/tmp/eggs-data';
                 await this.restorePrivateData();
             }
         }
@@ -108,7 +108,7 @@ class Syncfrom extends core_1.Command {
                 await (0, utils_2.exec)(`cp ${this.luksMountpoint}/etc/group ${this.rootDir}/etc/`, this.echo);
             }
         }
-        utils_1.default.warning('Restoring backup data');
+        utils_1.default.warning('Restoring crypted data');
         let cmd = `rsync -a ${this.luksMountpoint}/ROOT/ ${this.rootDir}/`;
         if (destDelete) {
             cmd = `rsync --archive --delete ${this.luksMountpoint}/ROOT/ ${this.rootDir}/`;
@@ -161,6 +161,6 @@ Syncfrom.flags = {
 };
 Syncfrom.description = 'restore users and user data from a LUKS volumes';
 Syncfrom.examples = [
-    'sudo eggs restore',
-    'sudo eggs restore --file /path/to/fileLUKS',
+    'sudo eggs syncfrom',
+    'sudo eggs syncfrom --file /path/to/fileLUKS',
 ];

package/dist/commands/syncto.js

@@ -67,12 +67,12 @@ class Syncto extends core_1.Command {
              * restore con file
              */
             if (fileVolume === '') {
-                fileVolume = '/tmp/luks-eggs-backup';
+                fileVolume = '/tmp/luks-eggs-data';
             }
             this.luksName = path_1.default.basename(fileVolume);
             this.luksFile = fileVolume;
             this.luksDevice = `/dev/mapper/${this.luksName}`;
-            this.luksMountpoint = '/tmp/eggs-backup';
+            this.luksMountpoint = '/tmp/eggs-data';
             if (!fs_1.default.existsSync(fileVolume)) {
                 await this.luksCreate();
             }