penguins-eggs 9.1.11 → 9.1.29

package/lib/classes/pacman.js

@@ -240,7 +240,7 @@ class Pacman {
      */
     static isCalamaresAvailable() {
         let result = this.distro().isCalamaresAvailable;
-        if (process.arch === 'armel' || process.arch === 'arm64') {
+        if (process.arch === 'arm' || process.arch === 'arm64') {
             result = false;
         }
         return result;
@@ -469,7 +469,6 @@ class Pacman {
          */
         if (this.distro().codenameLikeId === 'jessie') {
             const dest = '/etc/penguins-eggs.d/distros/jessie';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/krill`, echo);
             /**
              * Debian 9 stretch:  eredita grub, isolinux e locales da buster, contiene krill al posto di calamares
@@ -477,7 +476,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'stretch') {
             const dest = '/etc/penguins-eggs.d/distros/stretch';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${rootPen}/conf/distros/jessie/krill ${dest}/krill`, echo);
             /**
              * Debian 10 buster: eredita tutto da buster
@@ -485,7 +483,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'buster') {
             const dest = '/etc/penguins-eggs.d/distros/buster';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Debian 11 bullseye: eredita tutto da buster
@@ -493,7 +490,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'bullseye') {
             const dest = '/etc/penguins-eggs.d/distros/bullseye';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Debian 12 bookworm: eredita tutto da buster
@@ -501,7 +497,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'bookworm') {
             const dest = '/etc/penguins-eggs.d/distros/bookworm';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /***********************************************************************************
              * Devuan
@@ -512,7 +507,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'beowulf') {
             const dest = '/etc/penguins-eggs.d/distros/beowulf';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Devuan chimaera: eredita tutto da buster
@@ -520,7 +514,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'chimaera') {
             const dest = '/etc/penguins-eggs.d/distros/chimaera';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /**
              * Devuan daedalus: eredita tutto da buster
@@ -528,7 +521,6 @@ class Pacman {
         }
         else if (this.distro().codenameLikeId === 'daedalus') {
             const dest = '/etc/penguins-eggs.d/distros/daedalus';
-            // await exec(`cp -r ${buster}/locales ${dest}/locales`, echo)
             await (0, utils_2.exec)(`cp -r ${buster}/calamares ${dest}/calamares`, echo);
             /***********************************************************************************
              * Ubuntu
@@ -541,11 +533,8 @@ class Pacman {
             const dest = '/etc/penguins-eggs.d/distros/bionic';
             const bionic = `${rootPen}/conf/distros/bionic/*`;
             await (0, utils_2.exec)(`cp -r ${bionic} ${dest}`, echo);
-            // quindi da focal 
-            const focal = `${rootPen}/conf/distros/focal/*`;
-            await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
             // Poi da buster
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/remove-link ${dest}/calamares/calamares-modules/remove-link`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
@@ -560,37 +549,7 @@ class Pacman {
             const dest = '/etc/penguins-eggs.d/distros/focal';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/remove-link ${dest}/calamares/calamares-modules/remove-link`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
-            /**
-             * Ubuntu 20.10 groovy: eredita da focal e buster
-             */
-        }
-        else if (this.distro().codenameLikeId === 'groovy') {
-            const dest = '/etc/penguins-eggs.d/distros/groovy';
-            const focal = `${rootPen}/conf/distros/focal/*`;
-            await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/remove-link ${dest}/calamares/calamares-modules/remove-link`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/removeuser.yml ${dest}/calamares/modules/removeuser.yml`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/unpackfs.yml ${dest}/calamares/modules/unpackfs.yml`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/displaymanager.yml ${dest}/calamares/modules/displaymanager.yml`, echo);
-            /**
-             * Ubuntu 21.04 hirsute: eredita da focal e buster
-             */
-        }
-        else if (this.distro().codenameLikeId === 'hirsute') {
-            const dest = '/etc/penguins-eggs.d/distros/hirsute';
-            const focal = `${rootPen}/conf/distros/focal/*`;
-            await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/remove-link ${dest}/calamares/calamares-modules/remove-link`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
@@ -605,7 +564,7 @@ class Pacman {
             const dest = '/etc/penguins-eggs.d/distros/impish';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/remove-link ${dest}/calamares/calamares-modules/remove-link`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);
@@ -620,7 +579,7 @@ class Pacman {
             const dest = '/etc/penguins-eggs.d/distros/jammy';
             const focal = `${rootPen}/conf/distros/focal/*`;
             await (0, utils_2.exec)(`cp -r ${focal} ${dest}`, echo);
-            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/remove-link ${dest}/calamares/calamares-modules/remove-link`, echo);
+            await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/cleanup ${dest}/calamares/calamares-modules/cleanup`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk ${dest}/calamares/calamares-modules/sources-yolk`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/calamares-modules/sources-yolk-unmount ${dest}/calamares/calamares-modules/sources-yolk-unmount`, echo);
             await (0, utils_2.exec)(`cp -r ${buster}/calamares/modules/packages.yml ${dest}/calamares/modules/packages.yml`, echo);

package/lib/classes/sources_list.js

@@ -25,25 +25,11 @@ class SourcesList {
         * Linuxmint non ha nessuna configurazione in /etc/apt/sources.list
         */
         let checked = true;
-        const repos = await this.get();
-        if (repos.length !== 0) {
-            checked = false;
-            const distro = new distro_1.default();
-            for (const distribution of distributions) {
-                for (const repo of repos) {
-                    if (repo.includes(distro.codenameLikeId)) {
-                        checked = true;
-                    }
-                }
-            }
-            if (!checked) {
-                console.log('You are on: ' + chalk_1.default.green(distro.distroId) + '/' + chalk_1.default.green(distro.codenameId));
-                console.log('compatible with: ' + chalk_1.default.green(distro.distroLike) + '/' + chalk_1.default.green(distro.codenameLikeId));
-                console.log(`This costume/accessory apply to: `);
-                for (const distribution of distributions) {
-                    console.log(`- ${distribution}`);
-                }
-                utils_1.default.pressKeyToExit('distribution warning, check your /etc/apt/sources.list', true);
+        checked = false;
+        const distro = new distro_1.default();
+        for (const distribution of distributions) {
+            if (distribution.includes(distro.codenameLikeId)) {
+                checked = true;
             }
         }
         return checked;
@@ -84,8 +70,13 @@ class SourcesList {
      *
      */
     async get() {
+        let universalSourcesList = '/etc/apt/sources.list';
+        const distro = new distro_1.default();
+        if (distro.distroId === 'Linuxmint') {
+            universalSourcesList = '/etc/apt/sources.list.d/official-package-repositories.list';
+        }
         // deb uri distribution [component1] [component2] [...]
-        let checkRepos = await (0, utils_2.exec)(`grep "deb http"</etc/apt/sources.list`, { echo: false, capture: true });
+        let checkRepos = await (0, utils_2.exec)(`grep "deb http"<${universalSourcesList}`, { echo: false, capture: true });
         let tmp = [];
         if (checkRepos.code === 0) {
             tmp = checkRepos.data.split('\n');

package/lib/classes/tailor.d.ts

@@ -1,9 +1,3 @@
-/**
- * penguins-eggs: tailor.ts
- * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- *
- */
 import { IMateria } from '../interfaces';
 /**
  *
@@ -13,22 +7,30 @@ export default class Tailor {
     private echo;
     private costume;
     private wardrobe;
+    private category;
     materials: IMateria;
     /**
      * @param wardrobe
      * @param costume
      */
-    constructor(costume: string);
+    constructor(costume: string, category?: string);
+    /**
+     *
+     */
+    prepare(verbose?: boolean, no_accessories?: boolean, no_firmwares?: boolean): Promise<void>;
     /**
      *
+     * @param packages
+     * @param verbose
+     * @param section
+     * @returns
      */
-    prepare(verbose?: boolean, no_accessories?: boolean): Promise<void>;
+    helperExists(packages: string[], verbose?: boolean, section?: string): Promise<string[]>;
     /**
      * - check if every package if installed
-     * - if find any packages to install
-     * - install packages
+     * - if find any packages to install, install it
      */
-    helper(packages: string[], comment?: string, cmd?: string): Promise<void>;
+    helperInstall(packages: string[], comment?: string, cmd?: string): Promise<void>;
     /**
     * hostname and hosts
     */