penguins-eggs 10.0.2 → 10.0.7

package/dist/classes/incubation/branding.js

@@ -15,25 +15,25 @@ import yaml from 'js-yaml';
  * @returns
  */
 export function branding(remix, distro, theme = '', verbose = false) {
-    const { homeUrl } = distro;
-    const { supportUrl } = distro;
-    const bugReportUrl = 'https://github.com/pieroproietti/penguins-eggs/issues';
+    const { bugReportUrl, homeUrl, supportUrl } = distro;
+    // Li ridenomino per calamares
+    const productUrl = homeUrl;
+    // const supportUrl= supportUrl
+    const releaseNotesUrl = bugReportUrl;
+    const knownIssuesUrl = 'https://github.com/pieroproietti/penguins-eggs/issues/';
     const productName = remix.versionName; // Questa va nel titolo ed in basso
     const shortProductName = remix.fullname;
     const today = new Date();
-    const day = ('0' + today.getDate()).slice(-2);
-    const month = ('0' + (today.getMonth() + 1)).slice(-2);
-    const year = today.getFullYear();
-    const version = year + '-' + month + '-' + day;
-    const shortVersion = version;
-    const versionedName = remix.fullname + ' (' + version + ')'; // Questa la mette nella descrizione andrebbe aggiunta la versione dal nome della iso
+    const version = today.toISOString().split('T')[0]; // 2021-09-30
+    const shortVersion = version.split('-').join('.'); // 2021.09.30
+    const versionedName = remix.fullname + ' (' + shortVersion + ')';
     const shortVersionedName = remix.versionName + ' ' + version;
-    let bootloaderEntryName = distro.distroId;
     /**
      * some distros: Devuan, LMDE, syslinuxos
      * must have: bootloaderEntryName=Debian
      * to work on EFI
      */
+    let bootloaderEntryName = '';
     switch (distro.distroId.toLowerCase()) {
         case 'devuan':
         case 'lmde':
@@ -45,8 +45,6 @@ export function branding(remix, distro, theme = '', verbose = false) {
             bootloaderEntryName = distro.distroId;
         }
     }
-    const productUrl = homeUrl;
-    const releaseNotesUrl = 'https://github.com/pieroproietti/penguins-eggs/changelog.md';
     const productLogo = `${remix.branding}-logo.png`;
     const productIcon = `${remix.branding}-logo.png`;
     const productWelcome = 'welcome.png';
@@ -56,13 +54,13 @@ export function branding(remix, distro, theme = '', verbose = false) {
         images: {
             productIcon,
             productLogo,
-            productWelcome,
+            productWelcome
         },
         slideshow,
         slideshowAPI: 1,
         strings: {
             bootloaderEntryName,
-            bugReportUrl,
+            knownIssuesUrl,
             productName,
             productUrl,
             releaseNotesUrl,
@@ -71,20 +69,21 @@ export function branding(remix, distro, theme = '', verbose = false) {
             shortVersionedName,
             supportUrl,
             version,
-            versionedName,
+            versionedName
         },
         style: {
-            // li ripeto per calamares 3.3
-            SidebarBackground: "#010027",
-            SidebarBackgroundCurrent: "#017877",
-            SidebarText: "#FFFFFF",
-            SidebarTextCurrent: "#fbfbfb",
-            sidebarBackground: "#010027",
-            sidebarBackgroundCurrent: "#017877",
-            sidebarText: "#FFFFFF",
-            sidebarTextCurrent: "#fbfbfb"
+            // 3.3.x
+            SidebarBackground: '#292F34',
+            SidebarBackgroundCurrent: '#D35400',
+            SidebarText: '#FFFFFF',
+            SidebarTextCurrent: '#292F34',
+            // 3.2.x
+            sidebarBackground: '#292F34',
+            sidebarBackgroundCurrent: '#D35400',
+            sidebarText: '#FFFFFF',
+            sidebarTextCurrent: '#292F34'
         },
-        welcomeStyleCalamares: true,
+        welcomeStyleCalamares: true
     };
     return yaml.dump(branding);
 }

package/dist/classes/incubation/distros/focal.js

@@ -16,7 +16,7 @@ export class Focal {
     isClone;
     release = false;
     remix;
-    theme; // theme comprende il path  
+    theme; // theme comprende il path
     user_opt;
     verbose = false;
     /**

package/dist/classes/incubation/distros/rolling.d.ts

@@ -7,8 +7,8 @@
  */
 import { IDistro, IInstaller, IRemix } from '../../../interfaces/index.js';
 /**
-  *
-  */
+ *
+ */
 export declare class Rolling {
     distro: IDistro;
     installer: IInstaller;
@@ -26,7 +26,7 @@ export declare class Rolling {
      */
     constructor(installer: IInstaller, remix: IRemix, distro: IDistro, user_opt: string, release?: boolean, theme?: string, isClone?: boolean, verbose?: boolean);
     /**
-    * locale, partitions, users can come from themes
-    */
+     * locale, partitions, users can come from themes
+     */
     create(): Promise<void>;
 }

package/dist/classes/incubation/distros/rolling.js

@@ -8,8 +8,8 @@
 import CFS from '../../cfs.js';
 import Fisherman from '../fisherman.js';
 /**
-  *
-  */
+ *
+ */
 export class Rolling {
     distro;
     installer = {};
@@ -36,8 +36,8 @@ export class Rolling {
         this.isClone = isClone;
     }
     /**
-    * locale, partitions, users can come from themes
-    */
+     * locale, partitions, users can come from themes
+     */
     async create() {
         const fisherman = new Fisherman(this.distro, this.installer, this.verbose);
         await fisherman.createCalamaresSettings(this.theme, this.isClone);

package/dist/classes/incubation/fisherman-helper/packages.js

@@ -12,19 +12,22 @@ import Pacman from '../../pacman.js';
  * @returns yaml-string
  */
 export function remove(distro) {
-    const packages = [
-        'calamares-eggs',
-        'calamares-garuda',
-        'calamares',
-    ];
+    const packages = ['calamares-eggs', 'calamares-garuda', 'calamares'];
     if (distro.familyId === 'archlinux') {
         packages.push('penguins-eggs');
     }
     if (distro.familyId === 'debian') {
         packages.push('penguins-eggs', 'live-boot', 'live-boot-doc', 'live-boot-initramfs-tools', 'live-tools');
     }
-    let yaml = '';
+    const installedPackages = [];
     for (const elem of packages) {
+        if (Pacman.packageIsInstalled(elem)) {
+            installedPackages.push(elem);
+        }
+    }
+    installedPackages.sort();
+    let yaml = '';
+    for (const elem of installedPackages) {
         yaml += `  - ${elem.trim()}\n`;
     }
     if (yaml !== '') {

package/dist/classes/incubation/incubator.js

@@ -93,8 +93,8 @@ export default class Incubator {
                 break;
             }
             /**
-               * DEVUAN
-               */
+             * DEVUAN
+             */
             case 'beowulf': {
                 const beowulf = new Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
                 await beowulf.create();
@@ -111,8 +111,8 @@ export default class Incubator {
                 break;
             }
             /**
-               * UBUNTU
-               */
+             * UBUNTU
+             */
             case 'bionic': {
                 const bionic = new Bionic(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
                 await bionic.create();
@@ -134,8 +134,8 @@ export default class Incubator {
                 break;
             }
             /**
-               * Arch
-               */
+             * Arch
+             */
             case 'rolling': {
                 const rolling = new Rolling(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.isClone, this.verbose);
                 await rolling.create();
@@ -150,7 +150,6 @@ export default class Incubator {
      *
      */
     createBranding() {
-        // const branding = require('./branding.js').branding
         const dir = this.installer.configRoot + 'branding/' + this.remix.branding + '/';
         if (!fs.existsSync(dir)) {
             shx.exec(`mkdir ${dir} -p`);

package/dist/classes/incubation/installer.js

@@ -44,8 +44,7 @@ export function installer() {
      * se distro.isCalamaresAvailable()
      * i template di calamares e krill sono gli stessi
      */
-    const remix = {};
-    const distro = new Distro(remix);
+    const distro = new Distro();
     if (distro.isCalamaresAvailable) {
         installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/calamares/';
         /*

package/dist/classes/initrd.d.ts

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/initrd.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/initrd.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import { IInitrd } from '../interfaces/index.js';
 /**
  * initrd

package/dist/classes/initrd.js

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/initrd.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/initrd.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 /**
  * Schema from "refractasnapshot-10.2.10 (20191218)"
  * Copyright: fsmithred@gmail.com 2011-2019

package/dist/classes/keyboards.d.ts

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/keyboards.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/keyboards.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import { IXkbLayout, IXkbModel, IXkbOption, IXkbVariant } from '../interfaces/i-xkb-model.js';
 /**
  * /usr/share/X11/xkb/rules/xorg.lst

package/dist/classes/keyboards.js

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/keyboards.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/keyboards.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import fs from 'node:fs';
 import { exec } from '../lib/utils.js';
 // XkbModel - name of the model of your keyboard type

package/dist/classes/locales.d.ts

@@ -1,21 +1,21 @@
 /**
-* ./src/classes/locales.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/locales.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 export default class Locales {
     /**
-       *
-       */
+     *
+     */
     getDefault(): Promise<string>;
     /**
-       *
-       */
+     *
+     */
     getEnabled(): Promise<string[]>;
     /**
-       *
-       */
+     *
+     */
     getSupported(): Promise<string[]>;
 }

package/dist/classes/locales.js

@@ -1,17 +1,17 @@
 /**
-* ./src/classes/locales.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/locales.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import fs from 'node:fs';
 import { exec } from '../lib/utils.js';
 import Distro from './distro.js';
 export default class Locales {
     /**
-       *
-       */
+     *
+     */
     async getDefault() {
         const file = '/etc/default/locale';
         const cmd = `grep LANG < ${file}|cut -f2 -d=`;
@@ -19,14 +19,14 @@ export default class Locales {
         if (fs.existsSync(file)) {
             const result = await exec(cmd, { capture: true, echo: false, ignore: false });
             if (result.code === 0) {
-                defaultLanguage = result.data.replaceAll('"', '').replaceAll('\'', '').trim();
+                defaultLanguage = result.data.replaceAll('"', '').replaceAll("'", '').trim();
             }
         }
         return defaultLanguage;
     }
     /**
-       *
-       */
+     *
+     */
     async getEnabled() {
         // Restituisce i locales abilitati in Debian, per manjaro quelli presenti
         // in /etc/locale.gen anche se #disabilitati
@@ -36,14 +36,14 @@ export default class Locales {
         if (result.code === 0) {
             const lines = result.data.split('\n');
             for (const line of lines) {
-                enabledLocales.push(line.replaceAll('"', '').replaceAll('\'', '').trim());
+                enabledLocales.push(line.replaceAll('"', '').replaceAll("'", '').trim());
             }
         }
         return enabledLocales;
     }
     /**
-       *
-       */
+     *
+     */
     async getSupported() {
         const distro = new Distro();
         let supporteds = [];

package/dist/classes/n8.d.ts

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/n8.ts (node 8)
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/n8.ts (node 8)
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 export default class n8 {
     static dirent2string(dir: any): string;
     /**

package/dist/classes/n8.js

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/n8.ts (node 8)
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/n8.ts (node 8)
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import fs from 'node:fs';
 export default class n8 {
     static dirent2string(dir) {

package/dist/classes/network.d.ts

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/network.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/network.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import { Netmask } from 'netmask';
 /**
  *

package/dist/classes/network.js

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/network.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/network.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import { Netmask } from 'netmask';
 import os from 'node:os';
 /**
@@ -29,9 +29,7 @@ export default class Network {
                 const iface = interfaces[devName];
                 if (iface !== undefined) {
                     for (const alias of iface) {
-                        if (alias.family === 'IPv4' &&
-                            alias.address !== '127.0.0.1' &&
-                            !alias.internal) {
+                        if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) {
                             // take just the first!
                             if (this.address === '') {
                                 this.address = alias.address;
@@ -53,8 +51,8 @@ export default class Network {
                 }
             }
             /**
-                 * valori da netmask
-                 */
+             * valori da netmask
+             */
             this.o = new Netmask(this.cidr);
         }
     }

package/dist/classes/ovary.d.ts

@@ -1,10 +1,10 @@
 /**
-* ./src/classes/ovary.ts
-* penguins-eggs v.10.0.0 / ecmascript 2020
-* author: Piero Proietti
-* email: piero.proietti@gmail.com
-* license: MIT
-*/
+ * ./src/classes/ovary.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
 import { IAddons, IExcludes } from '../interfaces/index.js';
 import CliAutologin from '../lib/cli-autologin.js';
 import Incubator from './incubation/incubator.js';
@@ -82,9 +82,9 @@ export default class Ovary {
      */
     fertilization(snapshot_prefix?: string, snapshot_basename?: string, theme?: string, compression?: string, nointeratctive?: boolean): Promise<boolean>;
     /**
-   * finished = show the results
-   * @param scriptOnly
-   */
+     * finished = show the results
+     * @param scriptOnly
+     */
     finished(scriptOnly?: boolean): void;
     /**
      * initrdArch()
@@ -97,12 +97,12 @@ export default class Ovary {
      */
     initrdDebian(verbose?: boolean): Promise<void>;
     /**
-       *  async isolinux
-       */
+     *  async isolinux
+     */
     isolinux(theme?: string): Promise<void>;
     /**
-       * kernelCopy
-       */
+     * kernelCopy
+     */
     kernelCopy(): Promise<void>;
     /**
      *
@@ -114,8 +114,8 @@ export default class Ovary {
      */
     liveCreateStructure(): Promise<void>;
     /**
-   * makeDotDisk
-   */
+     * makeDotDisk
+     */
     makeDotDisk(info?: string, mksquashfs?: string, mkisofs?: string): void;
     makeEfi(theme?: string): Promise<void>;
     /**
@@ -128,27 +128,27 @@ export default class Ovary {
      */
     makeSquashfs(scriptOnly?: boolean, unsecure?: boolean): Promise<string>;
     /**
-   * Ritorna true se c'è bisogno del mount --bind
-   *
-   * Ci sono tre tipologie:
-   *
-   * - normal solo la creazione della directory, nessun mount
-   * - merged creazione della directory e mount ro
-   * - mergedAndOverlay creazione directory, overlay e mount rw
-   * - copied: creazione directory e copia
-   */
+     * Ritorna true se c'è bisogno del mount --bind
+     *
+     * Ci sono tre tipologie:
+     *
+     * - normal solo la creazione della directory, nessun mount
+     * - merged creazione della directory e mount ro
+     * - mergedAndOverlay creazione directory, overlay e mount rw
+     * - copied: creazione directory e copia
+     */
     merged(dir: string): boolean;
     /**
-   * Restituisce true per le direcory da montare con overlay
-   *
-   * Ci sono tre tipologie:
-   *
-   * - normal solo la creazione della directory, nessun mount
-   * - merged creazione della directory e mount ro
-   * - mergedAndOverlay creazione directory, overlay e mount rw
-   *
-   * @param dir
-   */
+     * Restituisce true per le direcory da montare con overlay
+     *
+     * Ci sono tre tipologie:
+     *
+     * - normal solo la creazione della directory, nessun mount
+     * - merged creazione della directory e mount ro
+     * - mergedAndOverlay creazione directory, overlay e mount rw
+     *
+     * @param dir
+     */
     mergedAndOverlay(dir: string): boolean;
     /**
      * produce
@@ -170,25 +170,25 @@ export default class Ovary {
     syslinux(): Promise<void>;
     /**
      * makeEfi
-    */
+     */
     /**
      *
      * @param cmd
      */
     tryCatch(cmd?: string): Promise<void>;
     /**
-       * ubind del fs live
-       * @param verbose
-       */
+     * ubind del fs live
+     * @param verbose
+     */
     uBindLiveFs(): Promise<void>;
     /**
-       *
-       * @param verbose
-       */
+     *
+     * @param verbose
+     */
     ubindVfs(): Promise<void>;
     /**
-    * fill
-    */
+     * fill
+     */
     usersFill(): Promise<Users[]>;
     /**
      *