penguins-eggs 8.1.3 → 9.0.16

package/lib/classes/incubation/incubator.js

@@ -7,18 +7,17 @@ const tslib_1 = require("tslib");
  * author: Piero Proietti
  * mail: piero.proietti@gmail.com
  */
-const fs = require("fs");
-const path = require("path");
-const shx = require("shelljs");
-const utils_1 = tslib_1.__importDefault(require("../utils"));
+const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
+const node_path_1 = (0, tslib_1.__importDefault)(require("node:path"));
+const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
+const utils_1 = (0, tslib_1.__importDefault)(require("../utils"));
 const jessie_1 = require("./distros/jessie");
 const buster_1 = require("./distros/buster");
-const bullseye_1 = require("./distros/bullseye");
-const beowulf_1 = require("./distros/beowulf");
 const focal_1 = require("./distros/focal");
 const bionic_1 = require("./distros/bionic");
+const rolling_1 = require("./distros/rolling");
 const installer_1 = require("./installer");
-const exec = require('../../lib/utils').exec;
+const utils_2 = require("../../lib/utils");
 /**
  *
  */
@@ -32,7 +31,7 @@ class Incubator {
     constructor(remix, distro, user_opt = 'live', verbose = false) {
         this.verbose = false;
         this.installer = {};
-        this.installer = installer_1.installer();
+        this.installer = (0, installer_1.installer)();
         this.remix = remix;
         this.distro = distro;
         this.user_opt = user_opt;
@@ -48,41 +47,84 @@ class Incubator {
         const verbose = true;
         const echo = utils_1.default.setEcho(verbose);
         this.createInstallerDirs();
-        if (this.distro.versionLike === 'jessie') {
-            const jessie = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await jessie.create();
-        }
-        else if (this.distro.versionLike === 'stretch') {
-            const stretch = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await stretch.create();
-        }
-        else if (this.distro.versionLike === 'buster') {
-            const buster = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await buster.create();
-        }
-        else if (this.distro.versionLike === 'bullseye') {
-            const bullseye = new bullseye_1.Bullseye(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await bullseye.create();
-        }
-        else if (this.distro.versionLike === 'beowulf') {
-            const beowulf = new beowulf_1.Beowulf(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await beowulf.create();
-        }
-        else if (this.distro.versionLike === 'focal') {
-            const focal = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await focal.create();
-        }
-        else if (this.distro.versionLike === 'groovy') {
-            const groovy = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await groovy.create();
-        }
-        else if (this.distro.versionLike === 'hirsute') {
-            const hirsute = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await hirsute.create();
-        }
-        else if (this.distro.versionLike === 'bionic') {
-            const bionic = new bionic_1.Bionic(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
-            await bionic.create();
+        // DEBIAN
+        switch (this.distro.versionLike) {
+            case 'jessie': {
+                const jessie = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await jessie.create();
+                break;
+            }
+            case 'stretch': {
+                const stretch = new jessie_1.Jessie(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await stretch.create();
+                break;
+            }
+            case 'bullseye': {
+                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await bullseye.create();
+                break;
+            }
+            case 'bookworm': {
+                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await bookworm.create();
+                // DEVUAN
+                break;
+            }
+            case 'beowulf': {
+                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await beowulf.create();
+                break;
+            }
+            case 'chimaera': {
+                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await chimaera.create();
+                break;
+            }
+            case 'daedalus': {
+                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await daedalus.create();
+                // UBUNTU
+                break;
+            }
+            /**
+             * Manjaro
+             */
+            case 'rolling': {
+                const rolling = new rolling_1.Rolling(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await rolling.create();
+                break;
+            }
+            case 'focal': {
+                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await focal.create();
+                break;
+            }
+            case 'groovy': {
+                const groovy = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await groovy.create();
+                break;
+            }
+            case 'hirsute': {
+                const hirsute = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await hirsute.create();
+                break;
+            }
+            case 'impish': {
+                const impish = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await impish.create();
+                break;
+            }
+            case 'jammy': {
+                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await jammy.create();
+                break;
+            }
+            case 'bionic': {
+                const bionic = new bionic_1.Bionic(this.installer, this.remix, this.distro, release, this.user_opt, this.verbose);
+                await bionic.create();
+                break;
+            }
+            // No default
         }
         this.createBranding();
     }
@@ -93,62 +135,62 @@ class Incubator {
         if (this.installer.name !== 'calamares') {
             // Remove krill configuration and multiarc if present
             try {
-                shx.exec('rm ' + this.installer.configuration + ' -rf');
+                shelljs_1.default.exec('rm ' + this.installer.configuration + ' -rf');
             }
             catch (error) {
                 console.log('error: ' + error + ' removing ' + this.installer.configuration + ' -rf');
             }
             try {
-                shx.exec('rm ' + this.installer.multiarch + ' -rf');
+                shelljs_1.default.exec('rm ' + this.installer.multiarch + ' -rf');
             }
             catch (error) {
                 console.log('error: ' + error + ' removing ' + this.installer.multiarch + ' -rf');
             }
         }
         // rootConfiguration krill calamares
-        if (!fs.existsSync(this.installer.configuration)) {
+        if (!node_fs_1.default.existsSync(this.installer.configuration)) {
             try {
-                fs.mkdirSync(this.installer.configuration);
+                node_fs_1.default.mkdirSync(this.installer.configuration);
             }
             catch (error) {
                 console.log('error: ' + error + ' creating ' + this.installer.configuration);
             }
         }
-        if (!fs.existsSync(this.installer.configuration + 'branding')) {
+        if (!node_fs_1.default.existsSync(this.installer.configuration + 'branding')) {
             try {
-                fs.mkdirSync(this.installer.configuration + 'branding');
+                node_fs_1.default.mkdirSync(this.installer.configuration + 'branding');
             }
             catch (error) {
                 console.log('error: ' + error + ' creating ' + this.installer.configuration + 'branding');
             }
         }
-        if (!fs.existsSync(this.installer.configuration + 'branding/eggs')) {
+        if (!node_fs_1.default.existsSync(this.installer.configuration + 'branding/eggs')) {
             try {
-                fs.mkdirSync(this.installer.configuration + 'branding/eggs');
+                node_fs_1.default.mkdirSync(this.installer.configuration + 'branding/eggs');
             }
             catch (error) {
                 console.log('error: ' + error + ' creating ' + this.installer.configuration + 'branding/eggs');
             }
         }
-        if (!fs.existsSync(this.installer.configuration + 'modules')) {
+        if (!node_fs_1.default.existsSync(this.installer.configuration + 'modules')) {
             try {
-                fs.mkdirSync(this.installer.configuration + 'modules');
+                node_fs_1.default.mkdirSync(this.installer.configuration + 'modules');
             }
             catch (error) {
                 console.log('error: ' + error + ' creating ' + this.installer.configuration + 'modules');
             }
         }
-        if (!fs.existsSync(this.installer.multiarch)) {
+        if (!node_fs_1.default.existsSync(this.installer.multiarch)) {
             try {
-                fs.mkdirSync(this.installer.multiarch);
+                node_fs_1.default.mkdirSync(this.installer.multiarch);
             }
             catch (error) {
                 console.log('error: ' + error + ' creating ' + this.installer.multiarch);
             }
         }
-        if (!fs.existsSync(this.installer.multiarchModules)) {
+        if (!node_fs_1.default.existsSync(this.installer.multiarchModules)) {
             try {
-                fs.mkdirSync(this.installer.multiarchModules);
+                node_fs_1.default.mkdirSync(this.installer.multiarchModules);
             }
             catch (error) {
                 console.log('error: ' + error + ' creating ' + this.installer.multiarchModules);
@@ -158,40 +200,40 @@ class Incubator {
          * ADDONS (only for calamares)
          */
         if (this.installer.name === 'calamares') {
-            const calamaresBranding = path.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/calamares/branding`);
-            if (fs.existsSync(calamaresBranding)) {
-                if (!fs.existsSync(this.installer.configuration + `branding/${this.remix.branding}`)) {
+            const calamaresBranding = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/calamares/branding`);
+            if (node_fs_1.default.existsSync(calamaresBranding)) {
+                if (!node_fs_1.default.existsSync(this.installer.configuration + `branding/${this.remix.branding}`)) {
                     try {
-                        fs.mkdirSync(this.installer.configuration + `branding/${this.remix.branding}`);
+                        node_fs_1.default.mkdirSync(this.installer.configuration + `branding/${this.remix.branding}`);
                     }
                     catch (error) {
                         console.log('error: ' + error + ' creating ' + this.installer.configuration + `branding/${this.remix.branding}`);
                     }
                 }
-                shx.cp(calamaresBranding + '/*', this.installer.configuration + `branding/${this.remix.branding}/`);
+                shelljs_1.default.cp(calamaresBranding + '/*', this.installer.configuration + `branding/${this.remix.branding}/`);
             }
             else {
                 console.log(`${calamaresBranding} not found!`);
                 process.exit();
             }
-            const calamaresIcon = path.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/artwork/install-debian.png`);
-            if (fs.existsSync(calamaresIcon)) {
-                shx.cp(calamaresIcon, '/usr/share/icons/');
+            const calamaresIcon = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/artwork/install-debian.png`);
+            if (node_fs_1.default.existsSync(calamaresIcon)) {
+                shelljs_1.default.cp(calamaresIcon, '/usr/share/icons/');
             }
             else {
                 console.log(`${calamaresIcon} not found!`);
                 process.exit();
             }
-            const calamaresLauncher = path.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/applications/install-debian.desktop`);
-            if (fs.existsSync(calamaresLauncher)) {
-                shx.cp(calamaresLauncher, '/usr/share/applications/');
+            const calamaresLauncher = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/applications/install-debian.desktop`);
+            if (node_fs_1.default.existsSync(calamaresLauncher)) {
+                shelljs_1.default.cp(calamaresLauncher, '/usr/share/applications/');
             }
             else {
                 console.log(`${calamaresLauncher} not found!`);
                 process.exit();
             }
             // script di avvio
-            shx.cp(path.resolve(__dirname, '../../../assets/calamares/install-debian'), '/sbin/install-debian');
+            shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../../assets/calamares/install-debian'), '/sbin/install-debian');
         }
     }
     /**
@@ -200,8 +242,8 @@ class Incubator {
     createBranding() {
         const branding = require('./branding').branding;
         const dir = this.installer.configuration + 'branding/' + this.remix.branding + '/';
-        if (!fs.existsSync(dir)) {
-            shx.exec(dir + ' -p');
+        if (!node_fs_1.default.existsSync(dir)) {
+            shelljs_1.default.exec(dir + ' -p');
         }
         const file = dir + 'branding.desc';
         const content = branding(this.remix, this.distro, this.verbose);
@@ -212,11 +254,11 @@ class Incubator {
      */
     async createInstallDebian() {
         const scriptInstallDebian = require('./calamares-modules/scripts/install-debian').installDebian;
-        const scriptDir = `/usr/bin/`;
+        const scriptDir = '/usr/bin/';
         const scriptFile = scriptDir + 'install-debian';
         const scriptContent = scriptInstallDebian();
         write(scriptFile, scriptContent, this.verbose);
-        await exec(`chmod +x ${scriptFile}`);
+        await (0, utils_2.exec)(`chmod +x ${scriptFile}`);
     }
 }
 exports.default = Incubator;
@@ -230,5 +272,5 @@ function write(file, content, verbose = false) {
     if (verbose) {
         console.log(`calamares: create ${file}`);
     }
-    fs.writeFileSync(file, content, 'utf8');
+    node_fs_1.default.writeFileSync(file, content, 'utf8');
 }

package/lib/classes/incubation/installer.d.ts

@@ -10,6 +10,6 @@
  * templateModules = template + '/modules/'
  * templateMultiarch = template + installer + '-modules/'
  *
-*/
-import { IInstaller } from '../../interfaces/index';
+ */
+import { IInstaller } from '../../interfaces';
 export declare function installer(): IInstaller;

package/lib/classes/incubation/installer.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installer = void 0;
 const tslib_1 = require("tslib");
-const distro_1 = tslib_1.__importDefault(require("../../classes/distro"));
-const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
-const utils_1 = tslib_1.__importDefault(require("../utils"));
+const distro_1 = (0, tslib_1.__importDefault)(require("../../classes/distro"));
+const pacman_1 = (0, tslib_1.__importDefault)(require("../../classes/pacman"));
 function installer() {
-    let installer = {};
+    const installer = {};
     if (pacman_1.default.packageIsInstalled('calamares')) {
         installer.name = 'calamares';
         installer.configuration = '/etc/calamares/';
@@ -20,11 +19,11 @@ function installer() {
     installer.modules = installer.configuration + 'modules/';
     installer.multiarchModules = installer.multiarch + 'modules/';
     /**
-     * i template nelle versioni calamaresAble sono QUELLI di calamares
+     * i template nelle versioni isCalamaresAvailable sono QUELLI di calamares
      */
     const remix = {};
     const distro = new distro_1.default(remix);
-    if (distro.calamaresAble) {
+    if (distro.isCalamaresAvailable) {
         installer.template = '/etc/penguins-eggs.d/distros/' + distro.versionLike + '/calamares/';
         installer.templateModules = installer.template + 'modules/';
         installer.templateMultiarch = installer.template + 'calamares-modules/';
@@ -42,18 +41,5 @@ exports.installer = installer;
  * @returns
  */
 function multiarch() {
-    let multiarch = '';
-    if (utils_1.default.machineArch() === 'amd64') {
-        multiarch = '/usr/lib/x86_64-linux-gnu/';
-    }
-    else if (utils_1.default.machineArch() === 'i386') {
-        multiarch = '/usr/lib/i386-linux-gnu/';
-    }
-    else if (utils_1.default.machineArch() === 'armel') {
-        multiarch = '/usr/lib/';
-    }
-    else if (utils_1.default.machineArch() === 'arm64') {
-        multiarch = '/usr/lib/';
-    }
-    return multiarch;
+    return pacman_1.default.distro().usrLibPath;
 }

package/lib/classes/initrd.d.ts

@@ -1,5 +1,5 @@
 /**
- * penguins-eggs: ovary.ts VERSIONE DEBIAN-LIVE
+ * penguins-eggs: initrd
  * author: Piero Proietti
  * mail: piero.proietti@gmail.com
  *

package/lib/classes/initrd.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * penguins-eggs: ovary.ts VERSIONE DEBIAN-LIVE
+ * penguins-eggs: initrd
  * author: Piero Proietti
  * mail: piero.proietti@gmail.com
  *
@@ -8,9 +8,10 @@
  * Copyright: fsmithred@gmail.com 2011-2019
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 // packages
-const fs = require("fs");
-const shx = require("shelljs");
+const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
+const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
 /**
  * initrd
  * Controlla e rimuove, se necessario cryptroot, resume
@@ -45,7 +46,7 @@ class Initrd {
     check() {
         const initrd = {};
         const cmdCheck = `lsinitramfs ${this.initrdSrc} | egrep 'conf/conf.d/cryptroot|cryptroot/crypttab|conf/conf.d/resume|conf/conf.d/zz-resume-auto'`;
-        const check = shx.exec(cmdCheck, { silent: true });
+        const check = shelljs_1.default.exec(cmdCheck, { silent: true });
         if (check.includes('conf/conf.d/cryptroot')) {
             initrd.cryptoroot = true;
         }
@@ -70,32 +71,38 @@ class Initrd {
         }
         const savedState = process.cwd();
         // cancello e ricreo la cartella di lavore
-        if (fs.existsSync(this.workDir)) {
-            shx.exec(`rm ${this.workDir} -rf`);
+        if (node_fs_1.default.existsSync(this.workDir)) {
+            shelljs_1.default.exec(`rm ${this.workDir} -rf`);
         }
-        shx.mkdir(this.workDir);
+        shelljs_1.default.mkdir(this.workDir);
         process.chdir(this.workDir);
         // Verifico il tipo di compressione
         const cmd = `file -L ${this.initrdSrc} | egrep -o 'gzip compressed|XZ compressed|cpio archive'`;
-        const compressionShell = shx.exec(cmd).trimLeft().trimRight();
-        if (compressionShell === 'gzip compressed') {
-        }
-        else if (compressionShell === 'xz compressed') {
-            this.compression = 'xz';
-        }
-        else if (compressionShell === 'cpio compressed') {
-            this.compression = 'cpio';
+        const compressionShell = shelljs_1.default.exec(cmd).trimStart().trimEnd();
+        switch (compressionShell) {
+            case 'gzip compressed': {
+                break;
+            }
+            case 'xz compressed': {
+                this.compression = 'xz';
+                break;
+            }
+            case 'cpio compressed': {
+                this.compression = 'cpio';
+                break;
+            }
+            // No default
         }
         // Estratto initrd nella cartella di lavoro
         console.log('compression: [' + this.compression + ']');
-        if (this.compression = 'gzip') {
-            shx.exec(`zcat ${initrd} | cpio -i`);
+        if ((this.compression = 'gzip')) {
+            shelljs_1.default.exec(`zcat ${initrd} | cpio -i`);
         }
         else if (this.compression === 'xz') {
-            shx.exec(`xzcat ${initrd} | cpio -d -i -m`);
+            shelljs_1.default.exec(`xzcat ${initrd} | cpio -d -i -m`);
         }
         else if (this.compression === 'cpio') {
-            shx.exec(`(cpio -i ; zcat | cpio -i) < ${initrd}`);
+            shelljs_1.default.exec(`(cpio -i ; zcat | cpio -i) < ${initrd}`);
         }
         process.chdir(savedState);
     }
@@ -104,23 +111,23 @@ class Initrd {
      */
     edit(verbose = true) {
         // Analizzo per cryptroot
-        if (fs.existsSync(`${this.workDir}/conf/conf.d/cryptroot`)) {
+        if (node_fs_1.default.existsSync(`${this.workDir}/conf/conf.d/cryptroot`)) {
             console.log('Removing cryptroot');
-            shx.exec(`rm -f ${this.workDir}/conf/conf.d/cryptroot`);
+            shelljs_1.default.exec(`rm -f ${this.workDir}/conf/conf.d/cryptroot`);
         }
-        else if (fs.existsSync(`${this.workDir}/cryptroot/crypttab`)) {
+        else if (node_fs_1.default.existsSync(`${this.workDir}/cryptroot/crypttab`)) {
             console.log('Removing crypttab');
-            shx.exec(`rm -f ${this.workDir}/cryptroot/crypttab`);
+            shelljs_1.default.exec(`rm -f ${this.workDir}/cryptroot/crypttab`);
         }
         // Analizzo per resume
-        if (fs.existsSync(`${this.workDir}/conf/conf.d/resume`)) {
+        if (node_fs_1.default.existsSync(`${this.workDir}/conf/conf.d/resume`)) {
             console.log('Removing resume');
-            shx.exec(`rm -f ${this.workDir}/conf/conf.d/resume`);
-            shx.exec(`rm -f ${this.fsLive}/etc/initramfs-tools/conf.d/resume`);
+            shelljs_1.default.exec(`rm -f ${this.workDir}/conf/conf.d/resume`);
+            shelljs_1.default.exec(`rm -f ${this.fsLive}/etc/initramfs-tools/conf.d/resume`);
         }
         else if (`${this.workDir}/conf/conf.d/zz-resume-auto`) {
-            shx.exec(`rm -f ${this.workDir}/rm -f conf/conf.d/zz-resume-auto`);
-            shx.exec(`rm -f ${this.fsLive}/etc/initramfs-tools/conf.d/resume`);
+            shelljs_1.default.exec(`rm -f ${this.workDir}/rm -f conf/conf.d/zz-resume-auto`);
+            shelljs_1.default.exec(`rm -f ${this.fsLive}/etc/initramfs-tools/conf.d/resume`);
         }
     }
     /**
@@ -136,10 +143,10 @@ class Initrd {
         process.chdir(this.workDir);
         console.log('work_dir: ' + this.workDir);
         if (this.compression === 'gzip') {
-            shx.exec(`find . -print0 | cpio -0 -H newc -o | gzip -c > ${this.initrdDest}`);
+            shelljs_1.default.exec(`find . -print0 | cpio -0 -H newc -o | gzip -c > ${this.initrdDest}`);
         }
         else if (this.compression === 'xz') {
-            shx.exec(`find . | cpio -o -H newc | xz --check=crc32 --x86 --lzma2=dict=512KiB > ${this.initrdDest}`);
+            shelljs_1.default.exec(`find . | cpio -o -H newc | xz --check=crc32 --x86 --lzma2=dict=512KiB > ${this.initrdDest}`);
         }
         process.chdir(savedState);
     }

package/lib/classes/krill_install.d.ts

@@ -60,6 +60,10 @@ export default class Hatching {
     settings: Settings;
     remix: IRemix;
     distro: IDistro;
+    luksName: string;
+    luksFile: string;
+    luksDevice: string;
+    luksMountpoint: string;
     /**
      * constructor
      */
@@ -143,10 +147,6 @@ export default class Hatching {
      * syncfs
      */
     private syncfs;
-    /**
-     *
-     */
-    private restoreUsersData;
     /**
      * mkfs
      */