penguins-eggs 9.6.23 → 9.8.1

package/dist/commands/install.js

@@ -11,10 +11,8 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
 const krill_prepare_1 = tslib_1.__importDefault(require("../krill/krill-prepare"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const axios_1 = tslib_1.__importDefault(require("axios"));
 const node_https_1 = tslib_1.__importDefault(require("node:https"));
 const agent = new node_https_1.default.Agent({
     rejectUnauthorized: false,
@@ -23,6 +21,30 @@ const agent = new node_https_1.default.Agent({
  * Class Krill
  */
 class Install extends core_1.Command {
+    static flags = {
+        btrfs: core_1.Flags.boolean({ char: 'b', description: 'Format btrfs' }),
+        crypted: core_1.Flags.boolean({ char: 'k', description: 'Crypted CLI installation' }),
+        custom: core_1.Flags.string({ char: 'c', description: 'custom unattended configuration' }),
+        domain: core_1.Flags.string({ char: 'd', description: 'Domain name, defult: .local' }),
+        halt: core_1.Flags.boolean({ char: 'H', description: 'Halt the system after installation' }),
+        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: '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' }),
+        small: core_1.Flags.boolean({ char: 's', description: 'Swap small: RAM' }),
+        suspend: core_1.Flags.boolean({ char: 'S', description: 'Swap suspend: RAM x 2' }),
+        unattended: core_1.Flags.boolean({ char: 'u', description: 'Unattended installation' }),
+        verbose: core_1.Flags.boolean({ char: 'v', description: 'Verbose' }),
+    };
+    static aliases = ['krill'];
+    static description = 'krill: the CLI system installer - the egg became a penguin!';
+    static examples = [
+        'sudo eggs install',
+        'sudo eggs install --unattended --halt',
+        'sudo eggs install --custom it',
+    ];
     /**
      * Execute
      */
@@ -36,19 +58,24 @@ class Install extends core_1.Command {
         }
         // krillConfig
         let krillConfig = {};
+        const content = fs_1.default.readFileSync('/etc/penguins-eggs.d/krill.yaml', 'utf8');
+        krillConfig = js_yaml_1.default.load(content);
+        /* removed
         if (custom !== undefined) {
-            const fname = node_path_1.default.basename(custom);
-            const url = `https://raw.githubusercontent.com/pieroproietti/penguins-wardrobe/main/config/${fname}.yaml`;
-            let res;
-            await axios_1.default.get(url, { httpsAgent: agent })
-                .then(function (response) {
-                krillConfig = js_yaml_1.default.load(response.data);
-            })
-                .catch(function (error) {
-                const content = fs_1.default.readFileSync('/etc/penguins-eggs.d/krill.yaml', 'utf8');
-                krillConfig = js_yaml_1.default.load(content);
-            });
+          const fname = path.basename(custom)
+          const url = `https://raw.githubusercontent.com/pieroproietti/penguins-wardrobe/main/config/${fname}.yaml`
+          let res: AxiosResponse
+          await axios.get(url, {httpsAgent: agent})
+          .then(function (response) {
+            krillConfig = yaml.load(response.data) as IKrillConfig
+          })
+          .catch(function (error) {
+            const content = fs.readFileSync('/etc/penguins-eggs.d/krill.yaml', 'utf8')
+            krillConfig = yaml.load(content) as IKrillConfig
+          })
         }
+      }
+      end removed */
         // nointeractive
         const nointeractive = flags.nointeractive;
         // halt
@@ -73,7 +100,7 @@ class Install extends core_1.Command {
         if (utils_1.default.isRoot()) {
             if (utils_1.default.isLive()) {
                 const krill = new krill_prepare_1.default(unattended, nointeractive, halt);
-                await krill.prepare(krillConfig, ip, random, domain, suspend, small, none, crypted, pve, verbose);
+                await krill.prepare(krillConfig, ip, random, domain, suspend, small, none, crypted, pve, flags.btrfs, verbose);
             }
             else {
                 utils_1.default.warning('You are in an installed system!');
@@ -84,27 +111,4 @@ class Install extends core_1.Command {
         }
     }
 }
-Install.flags = {
-    crypted: core_1.Flags.boolean({ char: 'k', description: 'Crypted CLI installation' }),
-    custom: core_1.Flags.string({ char: 'c', description: 'custom unattended configuration' }),
-    domain: core_1.Flags.string({ char: 'd', description: 'Domain name, defult: .local' }),
-    halt: core_1.Flags.boolean({ char: 'H', description: 'Halt the system after installation' }),
-    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: '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' }),
-    small: core_1.Flags.boolean({ char: 's', description: 'Swap small: RAM' }),
-    suspend: core_1.Flags.boolean({ char: 'S', description: 'Swap suspend: RAM x 2' }),
-    unattended: core_1.Flags.boolean({ char: 'u', description: 'Unattended installation' }),
-    verbose: core_1.Flags.boolean({ char: 'v', description: 'Verbose' }),
-};
-Install.aliases = ['krill'];
-Install.description = 'krill: the CLI system installer - the egg became a penguin!';
-Install.examples = [
-    'sudo eggs install',
-    'sudo eggs install --unattended --halt',
-    'sudo eggs install --custom it',
-];
 exports.default = Install;

package/dist/commands/kill.js

@@ -16,11 +16,18 @@ const kill_me_softly_1 = tslib_1.__importDefault(require("../lib/kill_me_softly"
  *
  */
 class Kill extends core_1.Command {
-    constructor() {
-        super(...arguments);
-        this.config_file = '/etc/penguins-eggs.d/eggs.yaml';
-        this.snapshot_dir = '';
-    }
+    static flags = {
+        help: core_1.Flags.help({ char: 'h' }),
+        nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
+        isos: core_1.Flags.boolean({ char: 'i', description: 'erase all ISOs on remote mount' }),
+        verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
+    };
+    static description = 'kill the eggs/free the nest';
+    static examples = [
+        'sudo eggs kill',
+    ];
+    config_file = '/etc/penguins-eggs.d/eggs.yaml';
+    snapshot_dir = '';
     async run() {
         utils_1.default.titles(this.id + ' ' + this.argv);
         const { flags } = await this.parse(Kill);
@@ -46,14 +53,4 @@ class Kill extends core_1.Command {
         }
     }
 }
-Kill.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    nointeractive: core_1.Flags.boolean({ char: 'n', description: 'no user interaction' }),
-    isos: core_1.Flags.boolean({ char: 'i', description: 'erase all ISOs on remote mount' }),
-    verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
-};
-Kill.description = 'kill the eggs/free the nest';
-Kill.examples = [
-    'sudo eggs kill',
-];
 exports.default = Kill;

package/dist/commands/mom.js

@@ -13,6 +13,13 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
 const utils_2 = require("../lib/utils");
 class Mom extends core_1.Command {
+    static flags = {
+        help: core_1.Flags.help({ char: 'h' }),
+    };
+    static description = 'ask help from mommy - TUI helper';
+    static examples = [
+        'eggs mom',
+    ];
     async run() {
         utils_1.default.titles(this.id + ' ' + this.argv);
         // No sudo!
@@ -24,11 +31,4 @@ class Mom extends core_1.Command {
         await (0, utils_2.exec)(cmd);
     }
 }
-Mom.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-};
-Mom.description = 'ask help from mommy - TUI helper';
-Mom.examples = [
-    'eggs mom',
-];
 exports.default = Mom;

package/dist/commands/produce.js

@@ -17,6 +17,39 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 class Produce extends core_1.Command {
+    static flags = {
+        addons: core_1.Flags.string({ multiple: true, description: 'addons to be used: adapt, ichoice, pve, rsupport' }),
+        basename: core_1.Flags.string({ description: 'basename' }),
+        clone: core_1.Flags.boolean({ char: 'c', description: 'clone' }),
+        cryptedclone: core_1.Flags.boolean({ char: 'C', description: 'crypted clone' }),
+        excludes: core_1.Flags.string({ multiple: true, description: 'use: custom, home, mine, usr, var' }),
+        help: core_1.Flags.help({ char: 'h' }),
+        links: core_1.Flags.string({ multiple: true, description: 'desktop links' }),
+        max: core_1.Flags.boolean({ char: 'm', description: 'max compression' }),
+        noicons: core_1.Flags.boolean({ char: 'N', description: 'no icons on desktop' }),
+        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' }),
+        unsecure: core_1.Flags.boolean({ char: 'u', description: '/root contents are included on live' }),
+        verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
+        yolk: core_1.Flags.boolean({ char: 'y', description: 'force yolk renew' }),
+    };
+    static description = 'produce a live image from your system whithout your data';
+    static examples = [
+        'sudo eggs produce',
+        'sudo eggs produce --standard',
+        'sudo eggs produce --max',
+        'sudo eggs produce --max --basename=colibri',
+        'sudo eggs produce --cryptedclone 4G',
+        'sudo eggs produce --clone',
+        'sudo eggs produce --basename=colibri',
+        'sudo eggs produce --basename=colibri --theme theme --addons adapt',
+        'sudo eggs produce --excludes=usr var',
+        'sudo eggs produce --excludes=static'
+    ];
     async run() {
         utils_1.default.titles(this.id + ' ' + this.argv);
         const { flags } = await this.parse(Produce);
@@ -46,27 +79,44 @@ class Produce extends core_1.Command {
                     }
                 }
             }
+            // links check
+            let myLinks = [];
+            if (flags.links) {
+                const links = flags.links;
+                for (let i = 0; i < links.length; i++) {
+                    if (node_fs_1.default.existsSync(`/usr/share/applications/${links[i]}.desktop`)) {
+                        myLinks.push(links[i]);
+                    }
+                    else {
+                        utils_1.default.warning('desktop link: ' + chalk_1.default.white('/usr/share/applications/' + links[i] + '.desktop') + ' not found!');
+                    }
+                }
+            }
             /**
              * composizione dei flag
              */
-            // filters
-            const filters = {};
-            filters.custom = false;
-            filters.dev = false;
-            filters.homes = false;
-            filters.usr = false;
-            if (flags.filters) {
-                if (flags.filters.includes('custom')) {
-                    filters.custom = true;
+            // excludes
+            const excludes = {};
+            excludes.static = false;
+            excludes.home = false;
+            excludes.mine = false;
+            excludes.usr = false;
+            excludes.var = false;
+            if (flags.excludes) {
+                if (flags.excludes.includes('static')) {
+                    excludes.static = true;
+                }
+                if (flags.excludes.includes('home')) {
+                    excludes.home = true;
                 }
-                if (flags.filters.includes('dev')) {
-                    filters.dev = true;
+                if (flags.excludes.includes('mine')) {
+                    excludes.mine = true;
                 }
-                if (flags.filters.includes('homes')) {
-                    filters.homes = true;
+                if (flags.excludes.includes('usr')) {
+                    excludes.usr = true;
                 }
-                if (flags.filters.includes('usr')) {
-                    filters.usr = true;
+                if (flags.excludes.includes('var')) {
+                    excludes.var = true;
                 }
             }
             let prefix = '';
@@ -87,7 +137,7 @@ class Produce extends core_1.Command {
                 compression = compressors.standard();
             }
             const release = flags.release;
-            const cryptedclone = flags.cryptedclone;
+            let cryptedclone = flags.cryptedclone;
             const clone = flags.clone;
             const verbose = flags.verbose;
             const scriptOnly = flags.script;
@@ -140,7 +190,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(clone, cryptedclone, scriptOnly, yolkRenew, release, myAddons, filters, nointeractive, noicons, unsecure, verbose);
+                await ovary.produce(clone, cryptedclone, scriptOnly, yolkRenew, release, myAddons, myLinks, excludes, nointeractive, noicons, unsecure, verbose);
                 ovary.finished(scriptOnly);
             }
         }
@@ -149,34 +199,8 @@ class Produce extends core_1.Command {
         }
     }
 }
-Produce.flags = {
-    addons: core_1.Flags.string({ multiple: true, description: 'addons to be used: adapt, ichoice, pve, rsupport' }),
-    basename: core_1.Flags.string({ description: 'basename' }),
-    clone: core_1.Flags.boolean({ char: 'c', description: 'clone' }),
-    cryptedclone: core_1.Flags.boolean({ char: 'C', description: 'crypted clone' }),
-    filters: core_1.Flags.string({ multiple: true, description: 'filters can be used: custom. dev, homes, usr' }),
-    help: core_1.Flags.help({ char: 'h' }),
-    max: core_1.Flags.boolean({ char: 'm', description: 'max compression' }),
-    noicons: core_1.Flags.boolean({ char: 'N', description: 'no icons on desktop' }),
-    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' }),
-    unsecure: core_1.Flags.boolean({ char: 'u', description: '/root contents are included on live' }),
-    verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
-    yolk: core_1.Flags.boolean({ char: 'y', description: 'force yolk renew' }),
-};
-Produce.description = 'produce a live image from your system whithout your data';
-Produce.examples = [
-    'sudo eggs produce',
-    'sudo eggs produce --standard',
-    'sudo eggs produce --max',
-    '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 theme --addons adapt',
-];
 exports.default = Produce;
+const validSizePattern = /^(\d+)([MG]?)$/;
+function isValidSize(input) {
+    return validSizePattern.test(input);
+}

package/dist/commands/status.js

@@ -14,6 +14,14 @@ const information_1 = tslib_1.__importDefault(require("../components/elements/in
  *
  */
 class Status extends core_1.Command {
+    static flags = {
+        help: core_1.Flags.help({ char: 'h' }),
+        verbose: core_1.Flags.boolean({ char: 'v' }),
+    };
+    static description = 'informations about eggs status';
+    static examples = [
+        'eggs status',
+    ];
     /**
      *
      */
@@ -26,12 +34,4 @@ class Status extends core_1.Command {
         await (0, information_1.default)(verbose);
     }
 }
-Status.flags = {
-    help: core_1.Flags.help({ char: 'h' }),
-    verbose: core_1.Flags.boolean({ char: 'v' }),
-};
-Status.description = 'informations about eggs status';
-Status.examples = [
-    'eggs status',
-];
 exports.default = Status;

package/dist/commands/syncfrom.js

@@ -13,20 +13,31 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = tslib_1.__importDefault(require("../classes/utils"));
 const utils_2 = require("../lib/utils");
+const distro_1 = tslib_1.__importDefault(require("../classes/distro"));
 /**
  *
  */
 class Syncfrom extends core_1.Command {
-    constructor() {
-        super(...arguments);
-        this.verbose = false;
-        this.echo = {};
-        this.rootDir = '/';
-        this.luksName = 'luks-eggs-data';
-        this.luksFile = `/run/live/medium/live/${this.luksName}`;
-        this.luksDevice = `/dev/mapper/${this.luksName}`;
-        this.luksMountpoint = '/tmp/eggs-data';
-    }
+    static flags = {
+        delete: core_1.Flags.string({ description: 'rsync --delete delete extraneous files from dest dirs' }),
+        file: core_1.Flags.string({ char: 'f', description: 'file containing luks-volume encrypted' }),
+        help: core_1.Flags.help({ char: 'h' }),
+        rootdir: core_1.Flags.string({ char: 'r', description: 'rootdir of the installed system, when used from live' }),
+        verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
+    };
+    static description = 'restore users and user data from a LUKS volumes';
+    static examples = [
+        'sudo eggs syncfrom',
+        'sudo eggs syncfrom --file /path/to/luks-volume',
+    ];
+    verbose = false;
+    echo = {};
+    rootDir = '/';
+    luksName = 'luks-volume';
+    luksFile = "";
+    luksDevice = `/dev/mapper/${this.luksName}`;
+    luksMountpoint = `/tmp/mnt/${this.luksName}`;
+    remix = {};
     async run() {
         const { flags } = await this.parse(Syncfrom);
         if (flags.verbose) {
@@ -51,7 +62,8 @@ class Syncfrom extends core_1.Command {
         }
         if (utils_1.default.isRoot()) {
             if (fileVolume === '') {
-                fileVolume = '/run/live/medium/live/luks-eggs-dada';
+                let distro = new distro_1.default(this.remix);
+                fileVolume = `${distro.liveMediumPath}live/${this.luksName}`;
             }
             if (!utils_1.default.isLive()) {
                 /**
@@ -61,7 +73,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-data';
+                    this.luksMountpoint = `/tmp/${this.luksName}`;
                     await this.restorePrivateData();
                     if (await utils_1.default.customConfirm('Your system was updated! Press a key to reboot')) {
                         await (0, utils_2.exec)('reboot');
@@ -78,7 +90,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-data';
+                this.luksMountpoint = `/tmp/${this.luksName}`;
                 await this.restorePrivateData();
             }
         }
@@ -95,24 +107,18 @@ class Syncfrom extends core_1.Command {
             await (0, utils_2.exec)(`mkdir ${this.luksMountpoint}`, this.echo);
         }
         await this.luksOpen();
-        /**
-         * ONLY FROM LIVE
-         * rm home, subst /etc/passwd, /etc/shadow, /etc/groups
-         */
         if (utils_1.default.isLive() && this.rootDir !== '/') {
-            utils_1.default.warning('Removing live user on destination system');
+            utils_1.default.warning('Restoring crypted data');
+            // Rimozione dei file esistenti
+            await (0, utils_2.exec)(`rm -rf ${this.rootDir}/etc/lightdm/lightdm.conf`, this.echo);
+            await (0, utils_2.exec)(`rm -rf ${this.rootDir}/etc/passwd`, this.echo);
+            await (0, utils_2.exec)(`rm -rf ${this.rootDir}/etc/group`, this.echo);
+            await (0, utils_2.exec)(`rm -rf ${this.rootDir}/etc/shadow`, this.echo);
             await (0, utils_2.exec)(`rm -rf ${this.rootDir}/home/*`, this.echo);
-            utils_1.default.warning('Restoring accounts');
-            await (0, utils_2.exec)(`cp ${this.luksMountpoint}/etc/passwd ${this.rootDir}/etc/`, this.echo);
-            await (0, utils_2.exec)(`cp ${this.luksMountpoint}/etc/shadow ${this.rootDir}/etc/`, this.echo);
-            await (0, utils_2.exec)(`cp ${this.luksMountpoint}/etc/group ${this.rootDir}/etc/`, this.echo);
-        }
-        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}/`;
+            // unsquashfs
+            const cmd = `unsquashfs -d ${this.rootDir} -f ${this.luksMountpoint}/private.squashfs`;
+            await (0, utils_2.exec)(cmd, utils_1.default.setEcho(true));
         }
-        await (0, utils_2.exec)(cmd, this.echo);
         await this.luksClose();
     }
     /**
@@ -150,16 +156,4 @@ class Syncfrom extends core_1.Command {
         }
     }
 }
-Syncfrom.flags = {
-    delete: core_1.Flags.string({ description: 'rsync --delete delete extraneous files from dest dirs' }),
-    file: core_1.Flags.string({ char: 'f', description: 'file LUKS volume encrypted' }),
-    help: core_1.Flags.help({ char: 'h' }),
-    rootdir: core_1.Flags.string({ char: 'r', description: 'rootdir of the installed system, when used from live' }),
-    verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
-};
-Syncfrom.description = 'restore users and user data from a LUKS volumes';
-Syncfrom.examples = [
-    'sudo eggs syncfrom',
-    'sudo eggs syncfrom --file /path/to/fileLUKS',
-];
 exports.default = Syncfrom;