penguins-eggs 8.1.0 → 9.0.9

package/lib/classes/pve-live.js

@@ -16,9 +16,9 @@ const tslib_1 = require("tslib");
  * sudo systemctl disable application.service
  * This will remove the symbolic link that indicated that the service should be started automatically.
  */
-const systemctl_1 = tslib_1.__importDefault(require("./systemctl"));
-const path = require("path");
-const shx = require("shelljs");
+const systemctl_1 = (0, tslib_1.__importDefault)(require("./systemctl"));
+const node_path_1 = (0, tslib_1.__importDefault)(require("node:path"));
+const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
 class PveLive {
     constructor() {
         this.systemctl = {};
@@ -36,7 +36,7 @@ class PveLive {
     disable() {
         this.systemctl.disable('pve-live');
     }
-    create(root = "/") {
+    create(root = '/') {
         this.createScript(root);
         this.createService(root);
     }
@@ -44,13 +44,13 @@ class PveLive {
      *
      */
     createScript(root = '/') {
-        shx.cp(path.resolve(__dirname, '../../scripts/pve-live.sh'), root + '/usr/bin/');
+        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../scripts/pve-live.sh'), root + '/usr/bin/');
     }
     /**
      *
      */
     createService(root = '/') {
-        shx.cp(path.resolve(__dirname, '../../scripts/pve-live.service'), root + '/lib/systemd/system/');
+        shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../scripts/pve-live.service'), root + '/lib/systemd/system/');
     }
     /**
      *

package/lib/classes/settings.js

@@ -10,17 +10,17 @@ const tslib_1 = require("tslib");
  *
  */
 // packages
-const fs = require("fs");
-const os = require("os");
-const yaml = require("js-yaml");
-const shx = require("shelljs");
-const pjson = require("pjson");
-const chalk = require("chalk");
+const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
+const node_os_1 = (0, tslib_1.__importDefault)(require("node:os"));
+const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
+const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
+const pjson_1 = (0, tslib_1.__importDefault)(require("pjson"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 // libraries
 // classes
-const utils_1 = tslib_1.__importDefault(require("./utils"));
-const distro_1 = tslib_1.__importDefault(require("./distro"));
-const pacman_1 = tslib_1.__importDefault(require("./pacman"));
+const utils_1 = (0, tslib_1.__importDefault)(require("./utils"));
+const distro_1 = (0, tslib_1.__importDefault)(require("./distro"));
+const pacman_1 = (0, tslib_1.__importDefault)(require("./pacman"));
 const config_file = '/etc/penguins-eggs.d/eggs.yaml';
 /**
  * Setting
@@ -46,8 +46,8 @@ class Settings {
         this.app.author = 'Piero Proietti';
         this.app.homepage = 'https://github.com/pieroproietti/penguins-eggs';
         this.app.mail = 'piero.proietti@gmail.com';
-        this.app.name = pjson.name;
-        this.app.version = pjson.version;
+        this.app.name = pjson_1.default.name;
+        this.app.version = pjson_1.default.version;
         this.isLive = utils_1.default.isLive();
         this.i686 = utils_1.default.isi686();
         this.distro = new distro_1.default(this.remix);
@@ -57,7 +57,7 @@ class Settings {
      * @param config
      */
     async save(config) {
-        fs.writeFileSync(config_file, yaml.dump(config), 'utf-8');
+        node_fs_1.default.writeFileSync(config_file, js_yaml_1.default.dump(config), 'utf-8');
     }
     /**
      * Load configuration from config_file
@@ -65,12 +65,12 @@ class Settings {
      */
     async load() {
         const foundSettings = true;
-        if (!fs.existsSync(config_file)) {
+        if (!node_fs_1.default.existsSync(config_file)) {
             console.log(`cannot find configuration file ${config_file},`);
-            console.log(`please generate it with: sudo eggs config`);
+            console.log('please generate it with: sudo eggs config');
             process.exit(1);
         }
-        this.config = yaml.load(fs.readFileSync(config_file, 'utf-8'));
+        this.config = js_yaml_1.default.load(node_fs_1.default.readFileSync(config_file, 'utf-8'));
         this.session_excludes = '';
         if (!this.config.snapshot_dir.endsWith('/')) {
             this.config.snapshot_dir += '/';
@@ -80,34 +80,30 @@ class Settings {
         this.work_dir.upperdir = this.work_dir.path + '.overlay/upperdir';
         this.work_dir.workdir = this.work_dir.path + '.overlay/workdir';
         this.work_dir.merged = this.work_dir.path + 'filesystem.squashfs';
-        this.efi_work = this.work_dir.path + 'efi/';
+        this.efi_work = this.work_dir.path + 'efi-work/';
         this.work_dir.pathIso = this.work_dir.path + 'iso/';
         if (this.config.snapshot_basename === 'hostname') {
-            this.config.snapshot_basename = os.hostname();
+            this.config.snapshot_basename = node_os_1.default.hostname();
         }
-        if (this.config.make_efi) {
-            if (!utils_1.default.isUefi()) {
-                utils_1.default.error('You choose to create an UEFI image, but miss to install grub-efi-amd64-bin package.');
-                utils_1.default.error('Please install it before to create an UEFI image:');
-                utils_1.default.warning('sudo apt install grub-efi-amd64-bin');
-                utils_1.default.error('or edit /etc/penguins-eggs.d/eggs.yaml and set the valuer of make_efi = false');
-                this.config.make_efi = false;
-            }
+        if (this.config.make_efi && !pacman_1.default.isUefi()) {
+            utils_1.default.error('You choose to create an UEFI image, but miss to install grub-efi-amd64-bin package.');
+            utils_1.default.error('Please install it before to create an UEFI image:');
+            utils_1.default.warning('sudo apt install grub-efi-amd64-bin');
+            utils_1.default.error('or edit /etc/penguins-eggs.d/eggs.yaml and set the valuer of make_efi = false');
+            this.config.make_efi = false;
         }
         this.kernel_image = this.config.vmlinuz;
         this.initrd_image = this.config.initrd_img;
-        this.vmlinuz = this.kernel_image.substr(this.kernel_image.lastIndexOf('/'));
-        this.initrdImg = this.initrd_image.substr(this.initrd_image.lastIndexOf('/'));
+        this.vmlinuz = this.kernel_image.slice(this.kernel_image.lastIndexOf('/'));
+        this.initrdImg = this.initrd_image.slice(this.initrd_image.lastIndexOf('/'));
         /**
          * Use the login name set in the config file. If not set, use the primary
          * user's name. If the name is not "user" then add boot option. ALso use
          * the same username for cleaning geany history.
          */
-        if (this.config.user_opt === undefined || this.config.user_opt === '') {
-            // this.user_opt = shx.exec('awk -F":" \'/1000:1000/ { print $1 }\' /etc/passwd', { silent: true }).stdout.trim()
-            if (this.config.user_opt === '') {
-                this.config.user_opt = 'live';
-            }
+        if ((this.config.user_opt === undefined || this.config.user_opt === '') && // this.user_opt = shx.exec('awk -F":" \'/1000:1000/ { print $1 }\' /etc/passwd', { silent: true }).stdout.trim()
+            this.config.user_opt === '') {
+            this.config.user_opt = 'live';
         }
         if (this.config.user_opt_passwd === '') {
             this.config.user_opt_passwd = 'evolution';
@@ -116,7 +112,7 @@ class Settings {
             this.config.root_passwd = 'evolution';
         }
         if (this.config.timezone === undefined || this.config.timezone === '') {
-            this.config.timezone = shx.exec('cat /etc/timezone', { silent: true }).stdout.trim();
+            this.config.timezone = shelljs_1.default.exec('cat /etc/timezone', { silent: true }).stdout.trim();
         }
         return foundSettings;
     }
@@ -128,24 +124,24 @@ class Settings {
         // console.log(`config_file:       ${config_file}`)
         console.log(`snapshot_dir:      ${this.config.snapshot_dir}`);
         if (this.config.snapshot_prefix === '') {
-            console.log('snapshot_prefix:   ' + chalk.bgYellow('no value') + ' run ' + chalk.cyan('sudo eggs dad') + ' or edit ' + chalk.cyan('/etc/penguins-eggs.d/eggs.yaml'));
+            console.log('snapshot_prefix:   ' + chalk_1.default.bgYellow('no value') + ' run ' + chalk_1.default.cyan('sudo eggs dad') + ' or edit ' + chalk_1.default.cyan('/etc/penguins-eggs.d/eggs.yaml'));
         }
         else {
-            console.log('snapshot_prefix:   ' + chalk.green(this.config.snapshot_prefix));
+            console.log('snapshot_prefix:   ' + chalk_1.default.green(this.config.snapshot_prefix));
         }
         console.log(`snapshot_basename: ${this.config.snapshot_basename}`);
         // console.log(`snapshot_excludes: ${this.config.snapshot_excludes}`)
-        if (fs.existsSync(this.kernel_image)) {
-            console.log(`kernel_image:      ` + chalk.green(this.kernel_image));
+        if (node_fs_1.default.existsSync(this.kernel_image)) {
+            console.log('kernel_image:      ' + chalk_1.default.green(this.kernel_image));
         }
         else {
-            console.log('kernel_image:      ' + chalk.red(this.kernel_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
+            console.log('kernel_image:      ' + chalk_1.default.red(this.kernel_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
         }
-        if (fs.existsSync(this.initrd_image)) {
-            console.log('initrd_image:      ' + chalk.green(this.initrd_image));
+        if (node_fs_1.default.existsSync(this.initrd_image)) {
+            console.log('initrd_image:      ' + chalk_1.default.green(this.initrd_image));
         }
         else {
-            console.log('initrd_image:      ' + chalk.red(this.initrd_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
+            console.log('initrd_image:      ' + chalk_1.default.red(this.initrd_image) + ' not found! Please edit /etc/penguins-eggs.d/eggs.yaml');
         }
         console.log(`work_dir:          ${this.work_dir.path}`);
         // console.log(`efi_work:          ${this.efi_work}`)
@@ -157,9 +153,9 @@ class Settings {
         console.log(`user_opt:          ${this.config.user_opt}`);
         console.log(`locales:           ${this.config.locales}`);
         console.log(`locale default:    ${this.config.locales_default}`);
-        //console.log(`ssh_pass:          ${this.config.ssh_pass}`)
+        // console.log(`ssh_pass:          ${this.config.ssh_pass}`)
         if (this.config.make_efi) {
-            if (!utils_1.default.isUefi()) {
+            if (!pacman_1.default.isUefi()) {
                 utils_1.default.error('You choose to create an UEFI image, but miss to install grub-efi-amd64-bin package.');
                 utils_1.default.error('Please install it before to create an UEFI image:');
                 utils_1.default.warning('sudo apt install grub-efi-amd64-bin');
@@ -179,8 +175,8 @@ class Settings {
      */
     async listFreeSpace() {
         const path = this.config.snapshot_dir; // convert to absolute path
-        if (!fs.existsSync(this.config.snapshot_dir)) {
-            fs.mkdirSync(this.config.snapshot_dir);
+        if (!node_fs_1.default.existsSync(this.config.snapshot_dir)) {
+            node_fs_1.default.mkdirSync(this.config.snapshot_dir);
         }
         /** Lo spazio usato da SquashFS non è stimabile da live
          * errore buffer troppo piccolo
@@ -190,7 +186,7 @@ class Settings {
         if (!utils_1.default.isLive()) {
             console.log(`Disk space used: ${Math.round((utils_1.default.getUsedSpace() / gb) * 10) / 10} GB`);
         }
-        spaceAvailable = Number(shx
+        spaceAvailable = Number(shelljs_1.default
             .exec(`df "${path}" | /usr/bin/awk 'NR==2 {print $4}'`, {
             silent: true
         })
@@ -199,11 +195,11 @@ class Settings {
         console.log(`There are ${utils_1.default.getSnapshotCount(this.config.snapshot_dir)} snapshots taking ${Math.round((utils_1.default.getSnapshotSize() / gb) * 10) / 10} GB of disk space.`);
         console.log();
         if (spaceAvailable > gb * 3) {
-            console.log(chalk.cyanBright('The free space should  be sufficient to hold the'));
-            console.log(chalk.cyanBright('compressed data from the system'));
+            console.log(chalk_1.default.cyanBright('The free space should  be sufficient to hold the'));
+            console.log(chalk_1.default.cyanBright('compressed data from the system'));
         }
         else {
-            console.log(chalk.redBright('The free space should be insufficient') + '.');
+            console.log(chalk_1.default.redBright('The free space should be insufficient') + '.');
             console.log();
             console.log('If necessary, you can create more available space');
             console.log('by removing previous  snapshots and saved copies:');
@@ -216,13 +212,8 @@ class Settings {
      */
     async loadRemix(basename = '', theme = '') {
         this.remix.versionNumber = utils_1.default.getPackageVersion();
-        this.remix.kernel = utils_1.default.kernerlVersion();
-        if (theme === '') {
-            this.remix.branding = 'eggs';
-        }
-        else {
-            this.remix.branding = theme;
-        }
+        this.remix.kernel = utils_1.default.kernelVersion();
+        this.remix.branding = theme === '' ? 'eggs' : theme;
         this.remix.name = this.config.snapshot_basename;
         let name = this.config.snapshot_prefix + this.config.snapshot_basename;
         name = name.replace(/-/g, ' ').replace('egg of ', '');

package/lib/classes/systemctl.d.ts

@@ -7,11 +7,11 @@
  * Presa da https://github.com/VolantisDev/node-systemctl
  */
 export default class SistemdCtl {
-    daemonReload(): Promise<any>;
-    disable(serviceName: string): Promise<any>;
-    enable(serviceName: string): Promise<any>;
+    daemonReload(): Promise<import("../interfaces").IExec>;
+    disable(serviceName: string): Promise<import("../interfaces").IExec>;
+    enable(serviceName: string): Promise<import("../interfaces").IExec>;
     isEnabled(serviceName: string): Promise<unknown>;
-    restart(serviceName: string): Promise<any>;
-    start(serviceName: string): Promise<any>;
-    stop(serviceName: string): Promise<any>;
+    restart(serviceName: string): Promise<import("../interfaces").IExec>;
+    start(serviceName: string): Promise<import("../interfaces").IExec>;
+    stop(serviceName: string): Promise<import("../interfaces").IExec>;
 }

package/lib/classes/systemctl.js

@@ -8,7 +8,7 @@
  * Presa da https://github.com/VolantisDev/node-systemctl
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const exec = require('../lib/utils').exec;
+const utils_1 = require("../lib/utils");
 class SistemdCtl {
     async daemonReload() {
         return run('daemon-reload');
@@ -23,21 +23,21 @@ class SistemdCtl {
         return new Promise((resolve, reject) => {
             run('is-enabled', serviceName)
                 .then((result) => {
-                resolve(result.stdout.indexOf('enabled') != -1);
+                resolve(result.data.includes('enabled'));
             })
-                .catch(function (err) {
+                .catch(function (error) {
                 resolve(false);
             });
         });
     }
     async restart(serviceName) {
-        return run("restart", serviceName);
+        return run('restart', serviceName);
     }
     start(serviceName) {
-        return run("start", serviceName);
+        return run('start', serviceName);
     }
     stop(serviceName) {
-        return run("stop", serviceName);
+        return run('stop', serviceName);
     }
 }
 exports.default = SistemdCtl;
@@ -50,5 +50,5 @@ async function run(cmd, serviceName = '') {
         command = command + ' ' + serviceName;
     }
     console.log(command);
-    return exec(command);
+    return (0, utils_1.exec)(command);
 }

package/lib/classes/tools.d.ts

@@ -18,7 +18,7 @@ interface IConfigTools {
 /**
  * Utils: general porpourse utils
  * @remarks all the utilities
-  */
+ */
 export default class Tools {
     tools_yaml: string;
     snapshot_dir: string;

package/lib/classes/tools.js

@@ -7,14 +7,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs = require("fs");
-const yaml = require("js-yaml");
-const settings_1 = tslib_1.__importDefault(require("./settings"));
-const utils_1 = tslib_1.__importDefault(require("./utils"));
+const node_fs_1 = (0, tslib_1.__importDefault)(require("node:fs"));
+const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
+const settings_1 = (0, tslib_1.__importDefault)(require("./settings"));
+const utils_1 = (0, tslib_1.__importDefault)(require("./utils"));
 /**
  * Utils: general porpourse utils
  * @remarks all the utilities
-  */
+ */
 class Tools {
     constructor() {
         this.tools_yaml = '/etc/penguins-eggs.d/tools.yaml';
@@ -23,14 +23,14 @@ class Tools {
         this.config = {};
     }
     /*
-    * Load configuration from /etc/penguins-eggs.yaml
-    * @returns {boolean} Success
-    */
+     * Load configuration from /etc/penguins-eggs.yaml
+     * @returns {boolean} Success
+     */
     async loadSettings() {
         let foundSettings = false;
-        if (fs.existsSync(this.tools_yaml)) {
+        if (node_fs_1.default.existsSync(this.tools_yaml)) {
             foundSettings = true;
-            const loaded = yaml.load(fs.readFileSync(this.tools_yaml, 'utf-8'));
+            const loaded = js_yaml_1.default.load(node_fs_1.default.readFileSync(this.tools_yaml, 'utf-8'));
             this.config.remoteHost = loaded.remoteHost;
             this.config.remoteUser = loaded.remoteUser;
             this.config.remotePathDeb = loaded.remotePathDeb;

package/lib/classes/utils.d.ts

@@ -21,8 +21,10 @@ export default class Utils {
     * ma viene avviato con init
     */
     static isSystemd(): boolean;
+    static isSysvinit(): boolean;
     /**
      * ricava path per vmlinuz
+     * BOOT_IMAGE=(hd0,msdos1)/vmlinuz-5.15.6-200.fc35.x86_64 root=UUID=91cf614e-62a1-464c-904f-38d0a1ceb7a7 ro rootflags=subvol=root rhgb quiet
      */
     static vmlinuz(): string;
     /**
@@ -122,12 +124,9 @@ export default class Utils {
      * @returns {boolean} true se l'architettura è i686
      */
     static isi686(): boolean;
-    /**
-     * Check se la macchina ha grub adatto ad efi
-     */
-    static isUefi(): boolean;
     /**
      * Controlla se è un pacchetto deb
+     * /usr/lib/penguins-eggs/bin/node
      */
     static isDebPackage(): boolean;
     /**
@@ -158,7 +157,6 @@ export default class Utils {
     static getAuthorName(): string;
     /**
      * Return the Debian version
-     * @remarks to move in Utils
      * @returns {number} Versione di Debian
      */
     static getDebianVersion(): number;
@@ -180,29 +178,29 @@ export default class Utils {
     /**
      * get the kernel version
      */
-    static kernerlVersion(): string;
+    static kernelVersion(): string;
     /**
      * return the name of network device
      */
     static iface(): string;
     /**
-     * todo
+     * address
      */
     static address(): string;
     /**
      * netmask
      */
     static netmask(): string;
-    /**
-     * @returns dns
-     */
-    static getDns(): string[];
-    static getDomain(): string;
     /**
      *
      * @returns
      */
     static broadcast(): string;
+    /**
+     * @returns dns
+     */
+    static getDns(): string[];
+    static getDomain(): string;
     /**
      * @returns gateway
      */
@@ -264,7 +262,6 @@ export default class Utils {
      * titles
      * Penguin's are gettings alive!
      */
-    static titles2(command?: string): Promise<void>;
     static titles(command?: string): void;
     /**
      *