penguins-eggs 8.17.4 → 9.0.2

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

@@ -1,19 +1,19 @@
 /**
-* penguins-eggs: fisherman.ts
-*
-* author: Piero Proietti
-* mail: piero.proietti@gmail.com
-*/
+ * penguins-eggs: fisherman.ts
+ *
+ * author: Piero Proietti
+ * mail: piero.proietti@gmail.com
+ */
 import { IDistro } from '../../interfaces';
-import { IInstaller } from '../../interfaces/index';
+import { IInstaller } from '../../interfaces';
 export default class Fisherman {
     installer: IInstaller;
     distro: IDistro;
     verbose: boolean;
     constructor(distro: IDistro, installer: IInstaller, verbose?: boolean);
     /**
-    * write setting
-    */
+     * write setting
+     */
     settings(branding?: string): Promise<void>;
     /**
      *
@@ -21,9 +21,9 @@ export default class Fisherman {
      */
     shellprocess(name: string): Promise<void>;
     /**
-    *
-    * @param name
-    */
+     *
+     * @param name
+     */
     contextualprocess(name: string): Promise<void>;
     /**
      *
@@ -50,13 +50,13 @@ export default class Fisherman {
      */
     show(name: string, type: string, path: string): void;
     /**
-    * ====================================================================================
-    * M O D U L E S
-    * ====================================================================================
-    */
+     * ====================================================================================
+     * M O D U L E S
+     * ====================================================================================
+     */
     /**
-    * Al momento rimane con la vecchia configurazione
-    */
+     * Al momento rimane con la vecchia configurazione
+     */
     moduleFinished(): Promise<void>;
     /**
      * Al momento rimane con la vecchia configurazione

package/lib/classes/incubation/fisherman.js

@@ -1,18 +1,19 @@
 "use strict";
 /**
-* penguins-eggs: fisherman.ts
-*
-* author: Piero Proietti
-* mail: piero.proietti@gmail.com
-*/
+ * penguins-eggs: fisherman.ts
+ *
+ * author: Piero Proietti
+ * mail: piero.proietti@gmail.com
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs = require("fs");
-const shx = require("shelljs");
-const path = require("path");
-const chalk = require("chalk");
-const utils_1 = tslib_1.__importDefault(require("../utils"));
-const exec = require('../../lib/utils').exec;
+const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
+const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
+const node_path_1 = (0, tslib_1.__importDefault)(require("node:path"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const utils_1 = (0, tslib_1.__importDefault)(require("../utils"));
+const displaymanager_1 = require("./fisherman-helper/displaymanager");
+const utils_2 = require("../../lib/utils");
 class Fisherman {
     constructor(distro, installer, verbose = false) {
         this.installer = {};
@@ -22,45 +23,50 @@ class Fisherman {
         this.verbose = verbose;
     }
     /**
-    * write setting
-    */
+     * write setting
+     */
     async settings(branding = 'eggs') {
-        let settings = this.installer.configuration + 'settings.conf';
-        shx.cp(this.installer.template + 'settings.yml', settings);
-        let s = '# ';
+        const settings = this.installer.configuration + 'settings.conf';
+        shelljs_1.default.cp(this.installer.template + 'settings.yml', settings);
+        let hasSystemd = '# ';
         if (utils_1.default.isSystemd()) {
-            s = '- ';
+            hasSystemd = '- ';
+        }
+        let hasDisplaymanager = '# ';
+        if ((0, displaymanager_1.displaymanager)() !== '') {
+            hasDisplaymanager = '- ';
         }
-        shx.sed('-i', '{{s}}', s, settings);
-        shx.sed('-i', '{{branding}}', branding, settings);
+        shelljs_1.default.sed('-i', '{{hasSystemd}}', hasSystemd, settings);
+        shelljs_1.default.sed('-i', '{{hasDisplaymanager}}', hasDisplaymanager, settings);
+        shelljs_1.default.sed('-i', '{{branding}}', branding, settings);
     }
     /**
      *
      * @param name
      */
     async shellprocess(name) {
-        const moduleSource = path.resolve(__dirname, this.installer.templateModules + 'shellprocess_' + name + '.yml');
+        const moduleSource = node_path_1.default.resolve(__dirname, this.installer.templateModules + 'shellprocess_' + name + '.yml');
         const moduleDest = this.installer.modules + 'shellprocess_' + name + '.conf';
-        if (fs.existsSync(moduleSource)) {
+        if (node_fs_1.default.existsSync(moduleSource)) {
             if (this.verbose)
                 this.show(name, 'shellprocess', moduleDest);
-            shx.cp(moduleSource, moduleDest);
+            shelljs_1.default.cp(moduleSource, moduleDest);
         }
         else if (this.verbose) {
             console.log(`calamares: ${name} shellprocess, nothing to do`);
         }
     }
     /**
-    *
-    * @param name
-    */
+     *
+     * @param name
+     */
     async contextualprocess(name) {
-        const moduleSource = path.resolve(__dirname, this.installer.templateModules + name + '_context.yml');
+        const moduleSource = node_path_1.default.resolve(__dirname, this.installer.templateModules + name + '_context.yml');
         const moduleDest = this.installer.modules + name + '_context.conf';
-        if (fs.existsSync(moduleSource)) {
+        if (node_fs_1.default.existsSync(moduleSource)) {
             if (this.verbose)
                 this.show(name, 'contextualprocess', moduleDest);
-            shx.cp(moduleSource, moduleDest);
+            shelljs_1.default.cp(moduleSource, moduleDest);
         }
         else if (this.verbose) {
             console.log(`calamares: ${name} contextualprocess, nothing to do!`);
@@ -72,7 +78,7 @@ class Fisherman {
      * @param replaces [['search','replace']]
      */
     async buildModule(name, vendor = '') {
-        let moduleSource = path.resolve(__dirname, this.installer.templateModules + name + '.yml');
+        let moduleSource = node_path_1.default.resolve(__dirname, this.installer.templateModules + name + '.yml');
         /**
          * We need vendor here to have possibility to load custom modules for calamares
          * the custom modules live in: /addons/vendor/theme/calamares/modules
@@ -90,19 +96,19 @@ class Fisherman {
          *
          */
         if (vendor !== '') {
-            const customModuleSource = path.resolve(__dirname, `../../../addons/${vendor}/theme/calamares/modules/${name}.yml`);
-            if (fs.existsSync(customModuleSource)) {
+            const customModuleSource = node_path_1.default.resolve(__dirname, `../../../addons/${vendor}/theme/calamares/modules/${name}.yml`);
+            if (node_fs_1.default.existsSync(customModuleSource)) {
                 moduleSource = customModuleSource;
             }
         }
         const moduleDest = this.installer.modules + name + '.conf';
-        if (fs.existsSync(moduleSource)) {
+        if (node_fs_1.default.existsSync(moduleSource)) {
             if (this.verbose)
                 this.show(name, 'module', moduleDest);
-            shx.cp(moduleSource, moduleDest);
+            shelljs_1.default.cp(moduleSource, moduleDest);
         }
         else if (this.verbose) {
-            console.log('unchanged: ' + chalk.greenBright(name));
+            console.log('unchanged: ' + chalk_1.default.greenBright(name));
         }
     }
     /**
@@ -111,7 +117,7 @@ class Fisherman {
      * @param isScript
      */
     async buildCalamaresModule(name, isScript = true) {
-        const moduleTemplate = path.resolve(__dirname, this.installer.templateMultiarch + name);
+        const moduleTemplate = node_path_1.default.resolve(__dirname, this.installer.templateMultiarch + name);
         const moduleDest = this.installer.multiarchModules + name;
         const moduleScript = `/usr/sbin/${name}.sh`;
         // console.log('moduleDest: ' + moduleDest)
@@ -119,13 +125,13 @@ class Fisherman {
         // console.log('moduleScript: ' + moduleScript)
         if (this.verbose)
             this.show(name, 'module', moduleDest);
-        if (!fs.existsSync(moduleDest)) {
-            fs.mkdirSync(moduleDest);
+        if (!node_fs_1.default.existsSync(moduleDest)) {
+            node_fs_1.default.mkdirSync(moduleDest);
         }
-        shx.cp(`${moduleTemplate}/module.yml`, `${moduleDest}/module.desc`);
+        shelljs_1.default.cp(`${moduleTemplate}/module.yml`, `${moduleDest}/module.desc`);
         if (isScript) {
-            shx.cp(`${moduleTemplate}/${name}.sh`, moduleScript);
-            await exec(`chmod +x ${moduleScript}`);
+            shelljs_1.default.cp(`${moduleTemplate}/${name}.sh`, moduleScript);
+            await (0, utils_2.exec)(`chmod +x ${moduleScript}`);
         }
         return moduleScript;
     }
@@ -134,17 +140,17 @@ class Fisherman {
      * @param name
      */
     async buildCalamaresPy(name) {
-        const moduleSource = path.resolve(__dirname, this.installer.templateMultiarch + '/' + name);
+        const moduleSource = node_path_1.default.resolve(__dirname, this.installer.templateMultiarch + '/' + name);
         const moduleDest = this.installer.multiarchModules + name;
         if (this.verbose)
             this.show(name, 'python', moduleDest);
-        if (!fs.existsSync(moduleDest)) {
-            fs.mkdirSync(moduleDest);
+        if (!node_fs_1.default.existsSync(moduleDest)) {
+            node_fs_1.default.mkdirSync(moduleDest);
         }
-        shx.cp(`${moduleSource}/module.yml`, `${moduleDest}/module.desc`);
-        shx.cp(`${moduleSource}/${name}.yml`, `${moduleDest}/${name}.conf`);
-        shx.cp(`${moduleSource}/main.py`, moduleDest);
-        await exec(`chmod +x ${moduleSource}/main.py`);
+        shelljs_1.default.cp(`${moduleSource}/module.yml`, `${moduleDest}/module.desc`);
+        shelljs_1.default.cp(`${moduleSource}/${name}.yml`, `${moduleDest}/${name}.conf`);
+        shelljs_1.default.cp(`${moduleSource}/main.py`, moduleDest);
+        await (0, utils_2.exec)(`chmod +x ${moduleSource}/main.py`);
     }
     /**
      *
@@ -153,32 +159,39 @@ class Fisherman {
      * @param path
      */
     show(name, type, path) {
-        if (type === 'module') {
-            console.log('fisherman: ' + chalk.yellow(name) + ' module in ' + chalk.yellow(path));
-        }
-        else if (type === 'calamares_module') {
-            console.log('fisherman: ' + chalk.cyanBright(name) + ' calamares_module in ' + chalk.cyanBright(path));
-        }
-        else if (type === 'shellprocess') {
-            console.log('fisherman: ' + chalk.green(name) + ' shellprocess in ' + chalk.green(path));
-        }
-        else if (type === 'contextualprocess') {
-            console.log('fisherman: ' + chalk.cyanBright(name) + ' shellprocess in ' + chalk.cyanBright(path));
+        switch (type) {
+            case 'module': {
+                console.log('fisherman: ' + chalk_1.default.yellow(name) + ' module in ' + chalk_1.default.yellow(path));
+                break;
+            }
+            case 'calamares_module': {
+                console.log('fisherman: ' + chalk_1.default.cyanBright(name) + ' calamares_module in ' + chalk_1.default.cyanBright(path));
+                break;
+            }
+            case 'shellprocess': {
+                console.log('fisherman: ' + chalk_1.default.green(name) + ' shellprocess in ' + chalk_1.default.green(path));
+                break;
+            }
+            case 'contextualprocess': {
+                console.log('fisherman: ' + chalk_1.default.cyanBright(name) + ' shellprocess in ' + chalk_1.default.cyanBright(path));
+                break;
+            }
+            // No default
         }
     }
     /**
-    * ====================================================================================
-    * M O D U L E S
-    * ====================================================================================
-    */
+     * ====================================================================================
+     * M O D U L E S
+     * ====================================================================================
+     */
     /**
-    * Al momento rimane con la vecchia configurazione
-    */
+     * Al momento rimane con la vecchia configurazione
+     */
     async moduleFinished() {
         const name = 'finished';
         await this.buildModule(name);
         const restartNowCommand = 'reboot';
-        shx.sed('-i', '{{restartNowCommand}}', restartNowCommand, this.installer.modules + name + '.conf');
+        shelljs_1.default.sed('-i', '{{restartNowCommand}}', restartNowCommand, this.installer.modules + name + '.conf');
     }
     /**
      * Al momento rimane con la vecchia configurazione
@@ -186,7 +199,7 @@ class Fisherman {
     async moduleUnpackfs() {
         const name = 'unpackfs';
         this.buildModule(name);
-        shx.sed('-i', '{{source}}', this.distro.mountpointSquashFs, this.installer.modules + name + '.conf');
+        shelljs_1.default.sed('-i', '{{source}}', this.distro.mountpointSquashFs, this.installer.modules + name + '.conf');
     }
     /**
      * usa i moduli-ts
@@ -195,7 +208,7 @@ class Fisherman {
         const name = 'displaymanager';
         const displaymanager = require('./fisherman-helper/displaymanager').displaymanager;
         this.buildModule(name);
-        shx.sed('-i', '{{displaymanagers}}', displaymanager(), this.installer.modules + name + '.conf');
+        shelljs_1.default.sed('-i', '{{displaymanagers}}', displaymanager(), this.installer.modules + name + '.conf');
     }
     /**
      * usa i moduli-ts
@@ -206,12 +219,12 @@ class Fisherman {
         const tryInstall = require('./fisherman-helper/packages').tryInstall;
         this.buildModule(name);
         if (remove) {
-            shx.sed('-i', '{{remove}}', removePackages(distro), this.installer.modules + name + '.conf');
+            shelljs_1.default.sed('-i', '{{remove}}', removePackages(distro), this.installer.modules + name + '.conf');
         }
         else {
-            shx.sed('-i', '{{remove}}', '', this.installer.modules + name + '.conf');
+            shelljs_1.default.sed('-i', '{{remove}}', '', this.installer.modules + name + '.conf');
         }
-        shx.sed('-i', '{{try_install}}', tryInstall(distro), this.installer.modules + name + '.conf');
+        shelljs_1.default.sed('-i', '{{try_install}}', tryInstall(distro), this.installer.modules + name + '.conf');
     }
     /**
      * Al momento rimane con la vecchia configurazione
@@ -219,7 +232,7 @@ class Fisherman {
     async moduleRemoveuser(username) {
         const name = 'removeuser';
         this.buildModule(name);
-        shx.sed('-i', '{{username}}', username, this.installer.modules + name + '.conf');
+        shelljs_1.default.sed('-i', '{{username}}', username, this.installer.modules + name + '.conf');
     }
 }
 exports.default = Fisherman;