penguins-eggs 9.5.19 → 9.5.21

package/dist/classes/settings.js

@@ -5,21 +5,19 @@
  * mail: piero.proietti@gmail.com
  *
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 // packages
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_os_1 = __importDefault(require("node:os"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const shelljs_1 = __importDefault(require("shelljs"));
-const chalk_1 = __importDefault(require("chalk"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_os_1 = tslib_1.__importDefault(require("node:os"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const pjson = require('../../package.json');
 // classes
-const utils_1 = __importDefault(require("./utils"));
-const distro_1 = __importDefault(require("./distro"));
-const pacman_1 = __importDefault(require("./pacman"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
 const config_file = '/etc/penguins-eggs.d/eggs.yaml';
 /**
  * Setting
@@ -35,6 +33,7 @@ class Settings {
         this.i686 = false;
         this.isLive = false;
         this.efi_work = '';
+        this.iso_work = '';
         this.kernel_image = '';
         this.initrd_image = '';
         this.vmlinuz = '';
@@ -74,13 +73,17 @@ class Settings {
         if (!this.config.snapshot_dir.endsWith('/')) {
             this.config.snapshot_dir += '/';
         }
-        this.work_dir.path = this.config.snapshot_dir + 'ovarium/';
-        this.work_dir.lowerdir = this.work_dir.path + '.overlay/lowerdir';
-        this.work_dir.upperdir = this.work_dir.path + '.overlay/upperdir';
-        this.work_dir.workdir = this.work_dir.path + '.overlay/workdir';
-        this.work_dir.merged = this.work_dir.path + 'filesystem.squashfs';
-        this.efi_work = this.work_dir.path + 'efi-work/';
-        this.work_dir.pathIso = this.work_dir.path + 'iso/';
+        this.work_dir.ovarium = this.config.snapshot_dir + 'ovarium/';
+        this.work_dir.lowerdir = this.work_dir.ovarium + '.overlay/lowerdir';
+        this.work_dir.upperdir = this.work_dir.ovarium + '.overlay/upperdir';
+        this.work_dir.workdir = this.work_dir.ovarium + '.overlay/workdir';
+        this.config.snapshot_mnt = this.config.snapshot_dir + 'mnt/';
+        if (!this.config.snapshot_mnt.endsWith('/')) {
+            this.config.snapshot_mnt += '/';
+        }
+        this.work_dir.merged = this.config.snapshot_mnt + 'filesystem.squashfs';
+        this.efi_work = this.config.snapshot_mnt + 'efi-work/';
+        this.iso_work = this.config.snapshot_mnt + 'iso/';
         // remember: before was hostname, not empty
         if (this.config.snapshot_basename === '') {
             this.config.snapshot_basename = node_os_1.default.hostname();
@@ -117,9 +120,68 @@ class Settings {
         return foundSettings;
     }
     /**
-     * showSettings
+     * Calculate and show free space on the disk
+     * @returns {void}
      */
-    async show() {
+    async listFreeSpace() {
+        if (!node_fs_1.default.existsSync(this.config.snapshot_dir)) {
+            node_fs_1.default.mkdirSync(this.config.snapshot_dir);
+            if (!node_fs_1.default.existsSync(this.config.snapshot_mnt)) {
+                node_fs_1.default.mkdirSync(this.config.snapshot_mnt);
+            }
+        }
+        /** Lo spazio usato da SquashFS non è stimabile da live
+         * errore buffer troppo piccolo
+         */
+        const gb = 1048576;
+        let spaceAvailable = 0;
+        if (!utils_1.default.isLive()) {
+            console.log(`Disk space used: ${Math.round((utils_1.default.getUsedSpace() / gb) * 10) / 10} GB`);
+        }
+        spaceAvailable = Number(shelljs_1.default
+            .exec(`df "${this.config.snapshot_mnt}" | /usr/bin/awk 'NR==2 {print $4}'`, {
+            silent: true,
+        })
+            .stdout.trim());
+        console.log(`Space available: ${Math.round((spaceAvailable / gb) * 10) / 10} GB`);
+        console.log(`There are ${utils_1.default.getSnapshotCount(this.config.snapshot_mnt)} snapshots taking ${Math.round((utils_1.default.getSnapshotSize(this.config.snapshot_mnt) / gb) * 10) / 10} GB of disk space.`);
+        console.log();
+        if (spaceAvailable > gb * 3) {
+            console.log(chalk_1.default.cyanBright('The free space should be sufficient to hold the'));
+            console.log(chalk_1.default.cyanBright('compressed data from the system'));
+        }
+        else {
+            console.log(chalk_1.default.redBright('The free space should be insufficient') + '.');
+            console.log();
+            if (utils_1.default.isMountpoint(this.config.snapshot_mnt)) {
+                console.log('If necessary, you can create more available space');
+                console.log('by removing previous  snapshots and saved copies.');
+            }
+            else {
+                console.log(`You can mount a free partition under ${this.config.snapshot_mnt}`);
+            }
+            console.log();
+        }
+    }
+    /**
+     *
+     * @param basename
+     * @param theme
+     */
+    async loadRemix(basename = '', theme = '') {
+        this.remix.versionNumber = utils_1.default.getPackageVersion();
+        this.remix.kernel = utils_1.default.kernelVersion();
+        this.remix.branding = theme === '' ? 'eggs' : this.remix.branding = theme.slice(Math.max(0, theme.lastIndexOf('/') + 1));
+        this.remix.name = this.config.snapshot_basename;
+        let name = this.config.snapshot_prefix + this.config.snapshot_basename;
+        name = name.replace(/-/g, ' ').replace('egg of ', '');
+        this.remix.fullname = name;
+        this.remix.versionName = name.toUpperCase();
+    }
+    /**
+    * show NOT USED MORE
+    */
+    async show_not_used_more() {
         console.log(`application_name:  ${this.app.name} ${this.app.version}`);
         // console.log(`config_file:       ${config_file}`)
         console.log(`snapshot_dir:      ${this.config.snapshot_dir}`);
@@ -143,7 +205,7 @@ class Settings {
         else {
             console.log('initrd_image:      ' + chalk_1.default.red(this.initrd_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
         }
-        console.log(`work_dir:          ${this.work_dir.path}`);
+        console.log(`snapshot_dir:          ${this.config.snapshot_dir}`);
         // console.log(`efi_work:          ${this.efi_work}`)
         // console.log(`make_efi:          ${this.config.make_efi}`)
         // console.log(`make_md5sum:       ${this.config.make_md5sum}`)
@@ -169,56 +231,5 @@ class Settings {
             }
         }
     }
-    /**
-     * Calculate and show free space on the disk
-     * @returns {void}
-     */
-    async listFreeSpace() {
-        const path = this.config.snapshot_dir; // convert to absolute path
-        if (!node_fs_1.default.existsSync(this.config.snapshot_dir)) {
-            node_fs_1.default.mkdirSync(this.config.snapshot_dir);
-        }
-        /** Lo spazio usato da SquashFS non è stimabile da live
-         * errore buffer troppo piccolo
-         */
-        const gb = 1048576;
-        let spaceAvailable = 0;
-        if (!utils_1.default.isLive()) {
-            console.log(`Disk space used: ${Math.round((utils_1.default.getUsedSpace() / gb) * 10) / 10} GB`);
-        }
-        spaceAvailable = Number(shelljs_1.default
-            .exec(`df "${path}" | /usr/bin/awk 'NR==2 {print $4}'`, {
-            silent: true,
-        })
-            .stdout.trim());
-        console.log(`Space available: ${Math.round((spaceAvailable / gb) * 10) / 10} GB`);
-        console.log(`There are ${utils_1.default.getSnapshotCount(this.config.snapshot_dir)} snapshots taking ${Math.round((utils_1.default.getSnapshotSize() / gb) * 10) / 10} GB of disk space.`);
-        console.log();
-        if (spaceAvailable > gb * 3) {
-            console.log(chalk_1.default.cyanBright('The free space should  be sufficient to hold the'));
-            console.log(chalk_1.default.cyanBright('compressed data from the system'));
-        }
-        else {
-            console.log(chalk_1.default.redBright('The free space should be insufficient') + '.');
-            console.log();
-            console.log('If necessary, you can create more available space');
-            console.log('by removing previous  snapshots and saved copies:');
-        }
-    }
-    /**
-     *
-     * @param basename
-     * @param theme
-     */
-    async loadRemix(basename = '', theme = '') {
-        this.remix.versionNumber = utils_1.default.getPackageVersion();
-        this.remix.kernel = utils_1.default.kernelVersion();
-        this.remix.branding = theme === '' ? 'eggs' : this.remix.branding = theme.slice(Math.max(0, theme.lastIndexOf('/') + 1));
-        this.remix.name = this.config.snapshot_basename;
-        let name = this.config.snapshot_prefix + this.config.snapshot_basename;
-        name = name.replace(/-/g, ' ').replace('egg of ', '');
-        this.remix.fullname = name;
-        this.remix.versionName = name.toUpperCase();
-    }
 }
 exports.default = Settings;

package/dist/classes/sources_list.js

@@ -5,14 +5,12 @@
  * mail: piero.proietti@gmail.com
  *
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = __importDefault(require("./utils"));
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
 const utils_2 = require("../lib/utils");
-const distro_1 = __importDefault(require("./distro"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
 /**
  *
  */

package/dist/classes/systemctl.js

@@ -7,12 +7,10 @@
  * gestione systemd
  * Presa da https://github.com/VolantisDev/node-systemctl
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const utils_1 = require("../lib/utils");
-const utils_2 = __importDefault(require("./utils"));
+const utils_2 = tslib_1.__importDefault(require("./utils"));
 class SistemdCtl {
     constructor(verbose = false) {
         this.echo = {};

package/dist/classes/tailor.js

@@ -1,23 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
 * penguins-eggs: tailor.ts
 * author: Piero Proietti
 * mail: piero.proietti@gmail.com
 *
 */
-const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = __importDefault(require("./utils"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
 const utils_2 = require("../lib/utils");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const pacman_1 = __importDefault(require("./pacman"));
-const distro_1 = __importDefault(require("./distro"));
-const sources_list_1 = __importDefault(require("./sources_list"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
+const sources_list_1 = tslib_1.__importDefault(require("./sources_list"));
 const pjson = require('../../package.json');
 /**
 *

package/dist/classes/tools.js

@@ -5,13 +5,11 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_fs_1 = __importDefault(require("node:fs"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const settings_1 = __importDefault(require("./settings"));
+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"));
 /**
  * Utils: general porpourse utils
  * @remarks all the utilities

package/dist/classes/users.js

@@ -1,9 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const utils_1 = require("../lib/utils");
 /**
  *

package/dist/classes/utils.js

@@ -6,23 +6,21 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const shelljs_1 = __importDefault(require("shelljs"));
-const fs_1 = __importDefault(require("fs"));
-const dns_1 = __importDefault(require("dns"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const inquirer_1 = __importDefault(require("inquirer"));
-const chalk_1 = __importDefault(require("chalk"));
-const pacman_1 = __importDefault(require("./pacman"));
+const tslib_1 = require("tslib");
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const dns_1 = tslib_1.__importDefault(require("dns"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const os_1 = tslib_1.__importDefault(require("os"));
+const inquirer = require('inquirer');
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
 const child_process_1 = require("child_process");
 const netmask_1 = require("netmask");
 // libraries
 const utils_1 = require("../lib/utils");
-const distro_1 = __importDefault(require("./distro"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
 const pjson = require('../../package.json');
 /**
  * Utils: general porpourse utils
@@ -229,10 +227,14 @@ class Utils {
      */
     static getSnapshotCount(snapshot_dir = '/') {
         if (fs_1.default.existsSync(snapshot_dir)) {
-            const list = fs_1.default.readdirSync(snapshot_dir);
-            if (list.length > 0) {
-                return list.length - 1;
+            const files = fs_1.default.readdirSync(snapshot_dir);
+            let nIsos = 0;
+            for (const f of files) {
+                if (f.endsWith('.iso')) {
+                    nIsos++;
+                }
             }
+            return nIsos;
         }
         return 0;
     }
@@ -242,7 +244,7 @@ class Utils {
      */
     static getSnapshotSize(snapshot_dir = '/') {
         let fileSizeInBytes = 0;
-        const size = shelljs_1.default.exec(`/usr/bin/find /home/eggs -maxdepth 1 -type f -name '*.iso' -exec du -sc {} + | tail -1 | awk '{print $1}'`, { silent: true }).stdout.trim();
+        const size = shelljs_1.default.exec(`/usr/bin/find ${snapshot_dir} -maxdepth 1 -type f -name '*.iso' -exec du -sc {} + | tail -1 | awk '{print $1}'`, { silent: true }).stdout.trim();
         if (size === '') {
             fileSizeInBytes = 0;
         }
@@ -732,7 +734,7 @@ class Utils {
                     default: 'No'
                 }
             ];
-            inquirer_1.default.prompt(questions).then(function (options) {
+            inquirer.prompt(questions).then(function (options) {
                 resolve(JSON.stringify(options));
             });
         });
@@ -752,7 +754,7 @@ class Utils {
                     default: 'No'
                 }
             ];
-            inquirer_1.default.prompt(questions).then(function (options) {
+            inquirer.prompt(questions).then(function (options) {
                 resolve(JSON.stringify(options));
             });
         });

package/dist/classes/xdg.js

@@ -5,19 +5,17 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const shelljs_1 = __importDefault(require("shelljs"));
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const pacman_1 = __importDefault(require("./pacman"));
-const utils_1 = __importDefault(require("./utils"));
-const n8_1 = __importDefault(require("./n8"));
+const tslib_1 = require("tslib");
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
+const n8_1 = tslib_1.__importDefault(require("./n8"));
 // libraries
 const utils_2 = require("../lib/utils");
-const distro_1 = __importDefault(require("./distro"));
+const distro_1 = tslib_1.__importDefault(require("./distro"));
 const xdg_dirs = ['DESKTOP', 'DOWNLOAD', 'TEMPLATES', 'PUBLICSHARE', 'DOCUMENTS', 'MUSIC', 'PICTURES', 'VIDEOS'];
 /**
  * Xdg: xdg-user-dirs, etc

package/dist/classes/yolk.js

@@ -1,20 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs-v7 based on Debian live
  * author: Piero Proietti
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-const fs_1 = __importDefault(require("fs"));
-const utils_1 = __importDefault(require("./utils"));
-const pacman_1 = __importDefault(require("./pacman"));
-const bleach_1 = __importDefault(require("./bleach"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const utils_1 = tslib_1.__importDefault(require("./utils"));
+const pacman_1 = tslib_1.__importDefault(require("./pacman"));
+const bleach_1 = tslib_1.__importDefault(require("./bleach"));
 const utils_2 = require("../lib/utils");
-const shelljs_1 = __importDefault(require("shelljs"));
+const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 /**
  *
  */

package/dist/commands/adapt.js

@@ -1,8 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs: adapt
  * author: Piero Proietti
@@ -10,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * license: MIT
  */
 const core_1 = require("@oclif/core");
-const utils_1 = __importDefault(require("../classes/utils"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
 const utils_2 = require("../lib/utils");
 class Adapt extends core_1.Command {
     async run() {

package/dist/commands/analyze.js

@@ -1,8 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs: analyze
  * author: Piero Proietti
@@ -10,12 +8,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * license: MIT
  */
 const core_1 = require("@oclif/core");
-const fs_1 = __importDefault(require("fs"));
-const utils_1 = __importDefault(require("../classes/utils"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
 const promises_1 = require("fs/promises");
 const fs_2 = require("fs");
-const users_1 = __importDefault(require("../classes/users"));
-const systeminformation_1 = __importDefault(require("systeminformation"));
+const users_1 = tslib_1.__importDefault(require("../classes/users"));
+const systeminformation_1 = tslib_1.__importDefault(require("systeminformation"));
 class Analyze extends core_1.Command {
     constructor() {
         super(...arguments);

package/dist/commands/calamares.js

@@ -1,8 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs-v7 based on Debian live
  * author: Piero Proietti
@@ -10,12 +8,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * license: MIT
  */
 const core_1 = require("@oclif/core");
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const utils_1 = __importDefault(require("../classes/utils"));
-const settings_1 = __importDefault(require("../classes/settings"));
-const incubator_1 = __importDefault(require("../classes/incubation/incubator"));
-const pacman_1 = __importDefault(require("../classes/pacman"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
+const settings_1 = tslib_1.__importDefault(require("../classes/settings"));
+const incubator_1 = tslib_1.__importDefault(require("../classes/incubation/incubator"));
+const pacman_1 = tslib_1.__importDefault(require("../classes/pacman"));
 class Calamares extends core_1.Command {
     constructor() {
         super(...arguments);
@@ -27,27 +25,21 @@ class Calamares extends core_1.Command {
         utils_1.default.titles(this.id + ' ' + this.argv);
         this.settings = new settings_1.default();
         const { flags } = await this.parse(Calamares);
-        let verbose = false;
-        if (flags.verbose) {
-            verbose = true;
-        }
-        let remove = false;
-        if (flags.remove) {
-            remove = true;
-        }
-        let install = false;
-        if (flags.install) {
-            install = true;
-        }
-        let release = false;
-        if (flags.release) {
-            release = true;
-        }
+        let verbose = flags.verbose;
+        let remove = flags.remove;
+        let install = flags.install;
+        let release = flags.release;
         let theme = 'eggs';
         if (flags.theme !== undefined) {
             theme = flags.theme;
-            if (theme.endsWith('/')) {
-                theme = theme.substring(0, theme.length - 1);
+            if (theme.includes('/')) {
+                if (theme.endsWith('/')) {
+                    theme = theme.substring(0, theme.length - 1);
+                }
+            }
+            else {
+                const wpath = `/home/${await utils_1.default.getPrimaryUser()}/.wardrobe/vendors/`;
+                theme = wpath + flags.theme;
             }
             theme = path_1.default.resolve(theme);
             if (!fs_1.default.existsSync(theme + '/theme')) {
@@ -85,7 +77,8 @@ class Calamares extends core_1.Command {
                             if (await this.settings.load()) {
                                 utils_1.default.warning('Configuring installer');
                                 await this.settings.loadRemix(this.settings.config.snapshot_basename, theme);
-                                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, theme, verbose);
+                                const isClone = false;
+                                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, theme, isClone, verbose);
                                 await this.incubator.config(release);
                             }
                         }

package/dist/commands/config.js

@@ -1,8 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs-v8
  * author: Piero Proietti
@@ -10,10 +8,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * license: MIT
  */
 const core_1 = require("@oclif/core");
-const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = __importDefault(require("../classes/utils"));
-const pacman_1 = __importDefault(require("../classes/pacman"));
-const bleach_1 = __importDefault(require("../classes/bleach"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
+const pacman_1 = tslib_1.__importDefault(require("../classes/pacman"));
+const bleach_1 = tslib_1.__importDefault(require("../classes/bleach"));
 const dependencies_1 = require("../lib/dependencies");
 const utils_2 = require("../lib/utils");
 /**

package/dist/commands/cuckoo.js

@@ -2,14 +2,12 @@
 /**
  * cuckoo: proxy
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const network_1 = __importDefault(require("../classes/network"));
-const utils_1 = __importDefault(require("../classes/utils"));
-const pxe_1 = __importDefault(require("../classes/pxe"));
+const network_1 = tslib_1.__importDefault(require("../classes/network"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
+const pxe_1 = tslib_1.__importDefault(require("../classes/pxe"));
 const tftp = require('tftp');
 class Cuckoo extends core_1.Command {
     async run(nest = '/home/eggs') {

package/dist/commands/dad.js

@@ -1,8 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /**
  * penguins-eggs-v8
  * author: Piero Proietti
@@ -10,9 +8,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * license: MIT
  */
 const core_1 = require("@oclif/core");
-const utils_1 = __importDefault(require("../classes/utils"));
-const daddy_1 = __importDefault(require("../classes/daddy"));
-const chalk_1 = __importDefault(require("chalk"));
+const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
+const daddy_1 = tslib_1.__importDefault(require("../classes/daddy"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const utils_2 = require("../lib/utils");
 class Dad extends core_1.Command {
     async run() {

package/dist/commands/export/deb.js

@@ -1,11 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const tools_1 = __importDefault(require("../../classes/tools"));
-const utils_1 = __importDefault(require("../../classes/utils"));
+const tools_1 = tslib_1.__importDefault(require("../../classes/tools"));
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
 const utils_2 = require("../../lib/utils");
 class ExportDeb extends core_1.Command {
     async run() {