penguins-eggs 10.0.38 → 10.0.40

package/dist/classes/tailor.js

@@ -6,18 +6,14 @@
  * license: MIT
  */
 import chalk from 'chalk';
-import yaml from 'js-yaml';
 import fs from 'node:fs';
-// pjson
-import { createRequire } from 'node:module';
+import yaml from 'js-yaml';
 import path from 'node:path';
 import { exec } from '../lib/utils.js';
 import Distro from './distro.js';
 import Pacman from './pacman.js';
 import SourcesList from './sources_list.js';
 import Utils from './utils.js';
-const require = createRequire(import.meta.url);
-const pjson = require('../../package.json');
 /**
  *
  */
@@ -26,8 +22,10 @@ export default class Tailor {
     category = 'costume';
     costume = '';
     echo = {};
+    toNull = ' > /dev/null 2>&1';
     verbose = false;
     wardrobe = '';
+    log = '';
     /**
      * @param wardrobe
      * @param costume
@@ -35,98 +33,24 @@ export default class Tailor {
     constructor(costume, category = 'costume') {
         this.costume = costume;
         this.wardrobe = path.dirname(path.dirname(costume));
+        this.log = path.dirname(this.wardrobe) + "/wardrobe.log";
         this.category = category;
     }
     /**
      *
-     * @param packages
-     * @param verbose
-     * @param section
-     * @returns
      */
-    async helperExists(packages, verbose = false, section = '') {
-        const packages_we_want = '/tmp/packages_we_want';
-        const packages_not_exists = '/tmp/packages_not_exists';
-        const packages_exists = '/tmp/packages_exists';
-        await exec(`rm -f ${packages_we_want}`);
-        await exec(`rm -f ${packages_not_exists}`);
-        await exec(`rm -f ${packages_exists}`);
-        /**
-         * packages_we_want
-         */
-        let content = '';
-        packages.sort();
-        for (const elem of packages) {
-            if (!Pacman.packageIsInstalled(elem)) {
-                content += elem + '\n';
-            }
-        }
-        fs.writeFileSync(packages_we_want, content, 'utf-8');
-        /**
-         * packages_exists
-         */
-        const distro = new Distro();
-        await (distro.familyId === 'debian' ? exec(`apt-cache --no-generate pkgnames | sort | comm -12 - ${packages_we_want} > ${packages_exists}`) : exec(`pacman -S --list | awk '{print $2}' | sort | comm -12 - ${packages_we_want} > ${packages_exists}`));
-        /**
-         * packages_not_exists
-         */
+    async prepare(verbose = true, no_accessories = false, no_firmwares = false) {
         if (verbose) {
-            await (distro.familyId === 'debian' ? exec(`apt-cache --no-generate pkgnames | sort | comm -13 - ${packages_we_want} > ${packages_not_exists}`) : exec(`pacman -S --list | awk '{print $2}' | sort | comm -13 - ${packages_we_want} > ${packages_not_exists}`));
-            const not_exist_packages = fs.readFileSync(packages_not_exists, 'utf8').split('\n');
-            if (not_exist_packages.length > 1) {
-                // Una riga c'è sempre
-                let content = '';
-                // for (const elem of not_exist_packages) {
-                for (let i = 0; i < not_exist_packages.length - 1; i++) {
-                    content += `- ${not_exist_packages[i]}\n`;
-                }
-                this.titles('tailor');
-                console.log('Following packages from ' + chalk.cyan(this.materials.name) + ' section: ' + chalk.cyan(section) + ', was not found:');
-                console.log(content);
-                Utils.pressKeyToExit('Press a key to continue...');
-            }
+            this.verbose = true;
+            this.toNull = '';
         }
-        return fs.readFileSync(packages_exists, 'utf8').split('\n');
-    }
-    /**
-     * - check if every package if installed
-     * - if find any packages to install, install it
-     */
-    async helperInstall(packages, comment = 'packages', cmd = 'apt-get install -yqq ') {
-        if (packages[0] !== null) {
-            const elements = [];
-            let strElements = '';
-            for (const elem of packages) {
-                elements.push(elem);
-                cmd += ` ${elem}`;
-                strElements += `, ${elem}`;
-            }
-            if (elements.length > 0) {
-                let step = `installing ${comment}: `;
-                if (!this.verbose) {
-                    step += strElements.slice(2);
-                }
-                /**
-                 * prova 3 volte
-                 */
-                const limit = 3;
-                for (let tempts = 1; tempts < limit; tempts++) {
-                    this.titles(step);
-                    Utils.warning(`tempts ${tempts} of ${limit}`);
-                    if (await tryCheckSuccess(cmd, this.echo)) {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    /**
-     *
-     */
-    async prepare(verbose = true, no_accessories = false, no_firmwares = false) {
-        this.verbose = verbose;
         this.echo = Utils.setEcho(verbose);
         Utils.warning(`preparing ${this.costume}`);
+        if (!fs.existsSync(this.log)) {
+            fs.writeFileSync(this.log, "# eggs wardrobe wear\n\n");
+        }
+        fs.appendFileSync(this.log, `## ${this.costume}\n`);
+        fs.appendFileSync(this.log, `Packages not found:\n`);
         /**
          * check curl presence
          */
@@ -204,15 +128,28 @@ export default class Tailor {
                 }
                 break;
             }
-            // No default
-        }
+            case 'Fedora': {
+                tailorList = `${this.costume}/fedora.yml`;
+                if (!fs.existsSync(tailorList)) {
+                    tailorList = `${this.costume}/debian.yml`;
+                    if (!fs.existsSync(tailorList)) {
+                        console.log(`no costume definition found compatible Fedora`);
+                        process.exit();
+                    }
+                }
+                break;
+            }
+        } // end analyze
+        /**
+         * find materials
+         */
         if (fs.existsSync(tailorList)) {
             this.materials = yaml.load(fs.readFileSync(tailorList, 'utf8'));
         }
-        else
+        else {
             switch (this.category) {
                 case 'costume': {
-                    this.titles(`${this.category}: ${this.costume}`);
+                    Utils.titles(`${this.category}: ${this.costume}`);
                     console.log("Tailor's list " + chalk.cyan(tailorList) + ' is not found \non your wardrobe ' + chalk.cyan(this.wardrobe) + '.\n');
                     console.log('Costume will not be installed, operations will abort.\n');
                     Utils.pressKeyToExit();
@@ -220,53 +157,22 @@ export default class Tailor {
                     break;
                 }
                 case 'accessory': {
-                    this.titles(`${this.category}: ${this.costume}`);
+                    Utils.titles(`${this.category}: ${this.costume}`);
                     console.log("Tailor's list " + chalk.cyan(tailorList) + ' is not found \non your wardrobe ' + chalk.cyan(this.wardrobe) + '.\n');
-                    console.log('Accessory will not be installed, operations will continue.\n');
-                    Utils.pressKeyToExit();
-                    return;
-                }
-                case 'try_accessory': {
+                    console.log('vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv');
+                    console.log('Accessory will not be installed,');
+                    console.log('operations will continue.');
+                    console.log('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^');
+                    sleep(3000);
                     return;
                 }
-                // No default
-            }
-        /**
-         * distro e sources_list
-         * vengono definite qua perchè servono a tutti
-         */
-        const sources_list = new SourcesList();
-        let step = '';
-        if (this.materials.distributions !== undefined) {
-            step = 'analyzing distribution';
-            Utils.warning(step);
-            if (!(await sources_list.distribution(this.materials.distributions))) {
-                switch (this.category) {
-                    case 'costume': {
-                        this.titles('step');
-                        console.log('Costume ' + chalk.cyan(this.materials.name) + ' is not compatible \nwith your ' + chalk.cyan(distro.distroId + '/' + distro.codenameId) + ' system.\n');
-                        console.log('Costume will not be installed, operations will abort.\n');
-                        Utils.pressKeyToExit();
-                        process.exit();
-                        break;
-                    }
-                    case 'accessory': {
-                        this.titles('step');
-                        console.log('Accessory ' + chalk.cyan(this.materials.name) + ' is not compatible \nwith your ' + chalk.cyan(distro.distroId + '/' + distro.codenameId) + ' system.\n');
-                        console.log('Accessory will not be installed, operations will continue.\n');
-                        Utils.pressKeyToExit();
-                        return;
-                    }
-                    case 'try_accessory': {
-                        return;
-                    }
-                    // No default
-                }
             }
         }
         /**
          * sequence
          */
+        const sources_list = new SourcesList();
+        let step = '';
         if (this.materials.sequence !== undefined) {
             step = 'analyzing sequence';
             Utils.warning(step);
@@ -329,10 +235,12 @@ export default class Tailor {
                         }
                         case 'alpine': {
                             await exec('apk update', Utils.setEcho(false));
-                            Utils.pressKeyToExit();
                             break;
                         }
-                        // No default
+                        case 'fedora': {
+                            await exec('dnf update', Utils.setEcho(false));
+                            break;
+                        }
                     }
                 }
                 /**
@@ -355,24 +263,27 @@ export default class Tailor {
                                 await exec('apk upgrade', Utils.setEcho(false));
                                 break;
                             }
-                            // No default
+                            case 'fedora': {
+                                await exec('dnf upgrade', Utils.setEcho(false));
+                                break;
+                            }
                         }
                     } //  upgrade true
                 } // undefined upgrade
             } // end sequence/repositories
             /**
-             * sequence/preinst
+             * sequence/cmds
              */
-            if (this.materials.sequence.preinst !== undefined && Array.isArray(this.materials.sequence.preinst)) {
-                step = 'preinst scripts';
+            if (this.materials.sequence.cmds !== undefined && Array.isArray(this.materials.sequence.cmds)) {
+                step = 'sequence commands';
                 Utils.warning(step);
-                for (const script of this.materials.sequence.preinst) {
-                    if (fs.existsSync(`${this.costume}/${script}`)) {
-                        await exec(`${this.costume}/${script} ${this.materials.name}`, Utils.setEcho(true));
+                for (const cmd of this.materials.sequence.cmds) {
+                    if (fs.existsSync(`${this.costume}/${cmd}`)) {
+                        await exec(`${this.costume}/${cmd} ${this.materials.name}`, Utils.setEcho(true));
                     }
                     else {
-                        // exec script real env
-                        await exec(`${script} ${this.materials.name}`, Utils.setEcho(true));
+                        // exec cmd real env
+                        await exec(`${cmd} ${this.materials.name}`, Utils.setEcho(true));
                     }
                 }
             }
@@ -380,66 +291,25 @@ export default class Tailor {
              * install packages
              */
             if (this.materials.sequence.packages !== undefined) {
-                switch (distro.familyId) {
-                    case 'debian': {
-                        const packages = await this.helperExists(this.materials.sequence.packages, true, 'packages');
-                        if (packages.length > 1) {
-                            await this.helperInstall(packages);
+                const packages = await this.packagesExists(this.materials.sequence.packages);
+                if (packages.length > 1) {
+                    switch (distro.familyId) {
+                        case 'debian': {
+                            await this.packagesInstall(packages);
+                            break;
+                        }
+                        case 'archlinux': {
+                            await this.packagesInstall(this.materials.sequence.packages, 'packages', `pacman -Sy --noconfirm`);
+                            break;
+                        }
+                        case 'alpine': {
+                            await this.packagesInstall(this.materials.sequence.packages, 'packages', `apk add`);
+                            break;
+                        }
+                        case 'fedora': {
+                            await this.packagesInstall(this.materials.sequence.packages, 'packages', `dnf install -y`);
+                            break;
                         }
-                        break;
-                    }
-                    case 'archlinux': {
-                        await this.helperInstall(this.materials.sequence.packages, 'packages', `pacman -Sy --noconfirm`);
-                        break;
-                    }
-                    case 'alpine': {
-                        await this.helperInstall(this.materials.sequence.packages, 'packages', `apk add`);
-                        break;
-                    }
-                    // No default
-                }
-            }
-            if (distro.familyId === 'debian') {
-                /**
-                 * sequence/packages_no_install_recommends
-                 */
-                if (this.materials.sequence.packages_no_install_recommends !== undefined) {
-                    const packages_no_install_recommends = await this.helperExists(this.materials.sequence.packages_no_install_recommends, true, 'packages_no_install_recommends');
-                    if (packages_no_install_recommends.length > 1) {
-                        await this.helperInstall(packages_no_install_recommends, 'packages without recommends and suggests', 'apt-get install --no-install-recommends --no-install-suggests -yq ');
-                    }
-                }
-                /**
-                 * sequence/try_packages
-                 */
-                if (this.materials.sequence.try_packages !== undefined) {
-                    const try_packages = await this.helperExists(this.materials.sequence.try_packages, false);
-                    if (try_packages.length > 1) {
-                        await this.helperInstall(try_packages, 'try packages ');
-                    }
-                }
-                /**
-                 * sequence/try_packages_no_install_recommends
-                 */
-                if (this.materials.sequence.try_packages_no_install_recommends !== undefined) {
-                    const try_packages_no_install_recommends = await this.helperExists(this.materials.sequence.try_packages_no_install_recommends, false);
-                    if (try_packages_no_install_recommends.length > 1) {
-                        await this.helperInstall(try_packages_no_install_recommends, 'try packages without recommends and suggests', 'apt-get install --no-install-recommends --no-install-suggests -yq ');
-                    }
-                }
-                /**
-                 * sequence/debs
-                 */
-                if (this.materials.sequence.debs !== undefined && this.materials.sequence.debs) {
-                    step = 'installing local packages';
-                    Utils.warning(step);
-                    let pathDebs = `${this.costume}/debs/${distro.codenameLikeId}`;
-                    if (!fs.existsSync(pathDebs)) {
-                        pathDebs = `${this.costume}/debs`;
-                    }
-                    // if exists pathDebs
-                    if (fs.existsSync(pathDebs)) {
-                        await exec(`dpkg -i ${pathDebs}/*.deb`);
                     }
                 }
             }
@@ -461,7 +331,6 @@ export default class Tailor {
              * sequence/accessories
              */
             if (!no_accessories) {
-                // accessories
                 if (this.materials.sequence.accessories !== undefined && Array.isArray(this.materials.sequence.accessories)) {
                     step = 'wearing accessories';
                     for (const elem of this.materials.sequence.accessories) {
@@ -469,80 +338,67 @@ export default class Tailor {
                             continue;
                         }
                         if (elem.slice(0, 2) === './') {
+                            // local accessory
                             const tailor = new Tailor(`${this.costume}/${elem.slice(2)}`, 'accessory');
                             await tailor.prepare(verbose);
                         }
                         else {
+                            // global accessory
                             const tailor = new Tailor(`${this.wardrobe}/accessories/${elem}`, 'accessory');
                             await tailor.prepare(verbose);
                         }
                     }
                 }
-                if (distro.familyId === 'debian' && // try_accessories
-                    this.materials.sequence.try_accessories !== undefined &&
-                    Array.isArray(this.materials.sequence.try_accessories)) {
-                    step = 'wearing try_accessories';
-                    for (const elem of this.materials.sequence.try_accessories) {
-                        if ((elem === 'firmwares' || elem === './firmwares') && no_firmwares) {
-                            continue;
-                        }
-                        if (elem.slice(0, 2) === './') {
-                            const tailor = new Tailor(`${this.costume}/${elem.slice(2)}`, 'try_accessory');
-                            await tailor.prepare(verbose);
-                        }
-                        else {
-                            const tailor = new Tailor(`${this.wardrobe}/accessories/${elem}`, 'try_accessory');
-                            await tailor.prepare(verbose);
-                        }
-                    }
-                }
             } // no-accessories
         } // end sequence
         /**
          * customize
          */
-        if (this.materials.customize !== undefined) {
+        if (this.materials.finalize !== undefined) {
             /**
-             * customize/dirs
+             * finalize/customize
              */
-            if (this.materials.customize.dirs && fs.existsSync(`/${this.costume}/dirs`)) {
-                step = 'copying dirs';
+            if (this.materials.finalize.customize && fs.existsSync(`/${this.costume}/sysroot`)) {
+                step = `finalize/customize: copying ${this.costume}/sysroot/ to /`;
                 Utils.warning(step);
-                let cmd = `rsync -avx  ${this.costume}/dirs/* /`;
+                let cmd = `rsync -avx  ${this.costume}/sysroot/* / ${this.toNull}`;
                 await exec(cmd, this.echo);
-                // chown root:root /etc -R
-                cmd = 'chown root:root /etc/sudoers.d /etc/skel -R';
+                // chown
+                cmd = `chown root:root /etc/sudoers.d /etc/skel -R`;
                 await exec(cmd, this.echo);
                 /**
                  * Copyng skel in /home/user
                  */
-                if (fs.existsSync(`${this.costume}/dirs/etc/skel`)) {
+                if (fs.existsSync(`${this.costume}/sysroot/etc/skel`)) {
                     const user = await Utils.getPrimaryUser();
-                    step = `copying skel in /home/${user}/`;
+                    step = `finalize/customize: copying skel in /home/${user}/`;
                     Utils.warning(step);
-                    cmd = `rsync -avx  ${this.costume}/dirs/etc/skel/.config /home/${user}/`;
+                    cmd = `rsync -avx  ${this.costume}/sysroot/etc/skel/.config /home/${user}/  ${this.toNull}`;
                     await exec(cmd, this.echo);
                     await exec(`chown ${user}:${user} /home/${user}/ -R`);
                 }
             }
             /**
-             * customize/scripts
+             * finalize/cmds
              */
-            if (this.materials.customize.scripts !== undefined && Array.isArray(this.materials.customize.scripts)) {
-                step = 'customize script';
+            if (this.materials.finalize.cmds !== undefined && Array.isArray(this.materials.finalize.cmds)) {
+                step = 'finalize/commands';
                 Utils.warning(step);
-                for (const script of this.materials.customize.scripts) {
-                    if (fs.existsSync(`${this.costume}/${script}`)) {
-                        // exec script in costume passing costume-name
-                        await exec(`${this.costume}/${script} ${this.materials.name}`, Utils.setEcho(true));
+                for (const cmd of this.materials.finalize.cmds) {
+                    if (fs.existsSync(`${this.costume}/${cmd}`)) {
+                        await exec(`${this.costume}/${cmd} ${this.materials.name}`, Utils.setEcho(true));
                     }
                     else {
-                        // exec script real env
-                        await exec(`${script}`, Utils.setEcho(true));
+                        // exec cmd real env
+                        await exec(`${cmd}`, Utils.setEcho(true));
                     }
                 }
             }
         }
+        // show log
+        if (fs.existsSync(this.log)) {
+            await exec(`cat ${this.log}`);
+        }
         /**
          * reboot
          */
@@ -557,15 +413,86 @@ export default class Tailor {
     }
     /**
      *
-     * @param command
+     * @param packages
+     * @param verbose
+     * @param section
+     * @returns
      */
-    titles(command = '') {
-        console.clear();
-        console.log('');
-        console.log(' E G G S: the reproductive system of penguins');
-        console.log('');
-        console.log(chalk.bgGreen.whiteBright('      ' + pjson.name + '      ') + chalk.bgWhite.blue(" Perri's Brewery edition ") + chalk.bgRed.whiteBright('       ver. ' + pjson.version + '       '));
-        console.log('wearing: ' + chalk.bgBlack.cyan(this.costume) + ' ' + chalk.bgBlack.white(command) + '\n');
+    async packagesExists(wanted) {
+        Utils.warning(`checking packages exists ${this.costume}`);
+        wanted.sort();
+        const distro = new Distro();
+        let cmd = "";
+        if (distro.familyId === "debian") {
+            cmd = `apt-cache --no-generate pkgnames`;
+        }
+        else if (distro.familyId === "archlinux") {
+            cmd = `pacman -S --list | awk '{print $2}'`;
+        }
+        else if (distro.familyId === "alpine") {
+            cmd = `apk search | awk -F'-[0-9]' '{print $1}' | sort -u`;
+        }
+        else if (distro.familyId === 'fedora') {
+            cmd = `dnf list available | awk '{print $1}' | sed 's/\.[^.]*$//'`;
+        }
+        //available = (await exec(cmd, { capture: true, echo: false, ignore: false })).data.split('\n')
+        let available = [];
+        available = (await exec(cmd, { capture: true, echo: false, ignore: false })).data.split('\n');
+        available.sort();
+        let exists = [];
+        let not_exists = [];
+        for (const elem of wanted) {
+            if (available.includes(elem)) {
+                exists.push(elem);
+            }
+            else {
+                not_exists.push(elem);
+                fs.appendFileSync(this.log, `- ${elem}\n`);
+            }
+        }
+        if (not_exists.length > 0) {
+            console.log(`${this.materials.name}, ${not_exists.length} following packages was not found:`);
+            for (const elem of not_exists) {
+                console.log(`-${elem}`);
+            }
+            console.log();
+            console.log("Wait 3 seconds");
+            await sleep(3000);
+        }
+        return exists;
+    }
+    /**
+   * - check if every package if installed
+   * - if find any packages to install, install it
+   */
+    async packagesInstall(packages, comment = 'packages', cmd = 'apt-get install -yqq ') {
+        Utils.warning(`installing existing packages ${this.costume}`);
+        if (packages[0] !== null) {
+            const elements = [];
+            let strElements = '';
+            for (const elem of packages) {
+                elements.push(elem);
+                cmd += ` ${elem}`;
+                strElements += `, ${elem}`;
+            }
+            if (elements.length > 0) {
+                let step = `installing ${comment}: `;
+                if (!this.verbose) {
+                    step += strElements.slice(2);
+                }
+                /**
+                 * prova 3 volte
+                 */
+                const limit = 3;
+                for (let tempts = 1; tempts < limit; tempts++) {
+                    Utils.titles(step);
+                    Utils.warning(`tempts ${tempts} of ${limit}`);
+                    if (await tryCheckSuccess(cmd, this.echo)) {
+                        break;
+                    }
+                }
+            }
+        }
     }
 }
 /**
@@ -585,3 +512,13 @@ async function tryCheckSuccess(cmd, echo) {
     }
     return success;
 }
+/**
+ *
+ * @param ms
+ * @returns
+ */
+function sleep(ms = 0) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}

package/dist/commands/wardrobe/wear.js

@@ -11,6 +11,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import Tailor from '../../classes/tailor.js';
 import Utils from '../../classes/utils.js';
+import { exec } from '../../lib/utils.js';
 /**
  *
  */
@@ -68,6 +69,8 @@ export default class Wear extends Command {
         if (await Utils.customConfirm(`Prepare your costume: ${costume}? Select yes to continue...`)) {
             if (Utils.isRoot()) {
                 const tailor = new Tailor(costume);
+                // delete previous log
+                await exec(`rm -f ${path.dirname(wardrobe)}+"/wardrobe.log`);
                 await tailor.prepare(verbose, no_accessories, no_firmwares);
             }
             else {

package/dist/interfaces/i-materia.d.ts

@@ -12,30 +12,25 @@ export interface IRepos {
 }
 export interface IMateria {
     author: string;
-    customize: {
-        dirs: boolean;
-        scripts: string[];
-    };
     description: string;
     distributions: string[];
     name: string;
-    reboot: boolean;
     release: string;
     sequence: {
-        accessories: string[];
-        debs: boolean;
-        packages: string[];
-        packages_no_install_recommends: string[];
-        packages_python: string[];
-        preinst: string[];
         repositories: {
             sources_list: string[];
             sources_list_d: string[];
             update: boolean;
             upgrade: boolean;
         };
-        try_accessories: string[];
-        try_packages: string[];
-        try_packages_no_install_recommends: string[];
+        cmds: string[];
+        packages: string[];
+        packages_python: string[];
+        accessories: string[];
     };
+    finalize: {
+        customize: boolean;
+        cmds: string[];
+    };
+    reboot: boolean;
 }