penguins-eggs 10.0.57 → 10.0.60

package/dist/classes/pacman.d/archlinux.js

@@ -23,8 +23,9 @@ export default class Archlinux {
         const echo = Utils.setEcho(verbose);
         // const cal_eggs = 'calamares-eggs-3.3.9-1-x86_64.pkg.tar.zst' // 01/09/2024
         // const cal_eggs = 'calamares-eggs-3.3.10-1-x86_64.pkg.tar.zst' // 24/10/2024
+        // const cal_eggs = 'calamares-eggs-3.3.12-2-x86_64.pkg.tar.zst' // 17/12/2024
         //let cmd = `wget -O /tmp/${cal_eggs} https://sourceforge.net/projects/penguins-eggs/files/packages/aur/${cal_eggs}/download`
-        const cal_eggs = 'calamares-eggs-3.3.12-2-x86_64.pkg.tar.zst'; // 17/12/2024
+        const cal_eggs = 'calamares-eggs-3.3.14-1-x86_64.pkg.tar.zst'; // 17/12/2024
         let cmd = `wget -O /tmp/${cal_eggs} https://penguins-eggs.net/basket/packages/aur/${cal_eggs}`; // 21/12/2024
         try {
             await exec(cmd, echo);

package/dist/classes/settings.d.ts

@@ -15,7 +15,6 @@ export default class Settings {
     app: IApp;
     config: IEggsConfig;
     distro: IDistro;
-    efi_work: string;
     i686: boolean;
     incubator: Incubator;
     initrd_image: string;

package/dist/classes/settings.js

@@ -27,7 +27,7 @@ export default class Settings {
     app = {};
     config = {};
     distro = {};
-    efi_work = '';
+    // efi_work = ''
     i686 = false;
     incubator = {};
     initrd_image = '';
@@ -122,7 +122,7 @@ export default class Settings {
         this.work_dir.upperdir = this.config.snapshot_dir + '.overlay/upperdir';
         this.work_dir.workdir = this.config.snapshot_dir + '.overlay/workdir';
         this.work_dir.merged = this.config.snapshot_mnt + 'filesystem.squashfs';
-        this.efi_work = this.config.snapshot_mnt + 'efi-work/';
+        // this.efi_work = this.config.snapshot_mnt + 'efi-work/'
         this.iso_work = this.config.snapshot_mnt + 'iso/';
         // remember: before was hostname, not empty
         if (this.config.snapshot_basename === '') {

package/dist/classes/utils.d.ts

@@ -77,6 +77,12 @@ export default class Utils {
      * @param device
      */
     static uuid(device: string): string;
+    /**
+     *
+     * @param device
+     * @returns
+     */
+    static uuidGen(): string;
     /**
      *
      * @param date
@@ -113,11 +119,6 @@ export default class Utils {
      * Fedora/RHEL have i386-pc
      */
     static uefiFormat(): string;
-    /**
-     *
-     * @returns
-     */
-    static uefiBN(): string;
     /**
      *
      * @returns

package/dist/classes/utils.js

@@ -311,6 +311,15 @@ export default class Utils {
         const uuid = shx.exec(`blkid -s UUID -o value ${device}`).stdout.trim();
         return uuid;
     }
+    /**
+     *
+     * @param device
+     * @returns
+     */
+    static uuidGen() {
+        const uuid = shx.exec(`uuidgen`, { silent: true }).stdout.trim();
+        return uuid;
+    }
     /**
      *
      * @param date
@@ -422,20 +431,6 @@ export default class Utils {
         }
         return format;
     }
-    /**
-     *
-     * @returns
-     */
-    static uefiBN() {
-        let bn = 'nothing.efi';
-        if (process.arch === 'x64') {
-            bn = 'BOOTX64.EFI';
-        }
-        else if (process.arch === 'arm64') {
-            bn = 'bootaa64.efi';
-        }
-        return bn;
-    }
     /**
      *
      * @returns
@@ -815,7 +810,6 @@ export default class Utils {
      * @param text
      */
     static write(file, text) {
-        text = text.trim() + '\n';
         text = text.trim() + '\n';
         file = file.trim();
         fs.writeFileSync(file, text);
@@ -892,7 +886,7 @@ export default class Utils {
                     name: 'confirm',
                     message: msg,
                     choices: ['No', 'Yes', 'Abort'],
-                    default: 'No'
+                    default: 'Yes'
                 }
             ];
             inquirer.prompt(questions).then(function (options) {

package/dist/commands/install.d.ts

@@ -27,6 +27,7 @@ export default class Install extends Command {
         random: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         small: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         suspend: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        testing: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         unattended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };

package/dist/commands/install.js

@@ -10,10 +10,11 @@ import yaml from 'js-yaml';
 import fs from 'node:fs';
 import https from 'node:https';
 import Utils from '../classes/utils.js';
-import Krill from '../krill/prepare.js';
+import Krill from '../krill/classes/prepare.js';
 const agent = new https.Agent({
     rejectUnauthorized: false
 });
+// import { ILvmOptions } from '../krill/interfaces/i-krill.js'
 /**
  * Class Krill
  */
@@ -35,6 +36,7 @@ export default class Install extends Command {
         random: Flags.boolean({ char: 'r', description: 'Add random to hostname, eg: colibri-ay412dt' }),
         small: Flags.boolean({ char: 's', description: 'Swap small: RAM' }),
         suspend: Flags.boolean({ char: 'S', description: 'Swap suspend: RAM x 2' }),
+        testing: Flags.boolean({ char: 't', description: "Just testing krill" }),
         unattended: Flags.boolean({ char: 'u', description: 'Unattended installation' }),
         verbose: Flags.boolean({ char: 'v', description: 'Verbose' })
     };
@@ -71,11 +73,12 @@ export default class Install extends Command {
         if (pve) {
             crypted = false;
         }
+        const { testing } = flags;
         const { verbose } = flags;
-        if (Utils.isRoot()) {
-            if (Utils.isLive()) {
+        if (Utils.isRoot() || testing) {
+            if (Utils.isLive() || testing) {
                 const krill = new Krill(unattended, nointeractive, halt, chroot);
-                await krill.prepare(krillConfig, ip, random, domain, suspend, small, none, crypted, pve, flags.btrfs, verbose);
+                await krill.prepare(krillConfig, ip, random, domain, suspend, small, none, crypted, pve, flags.btrfs, testing, verbose);
             }
             else {
                 Utils.warning('You are in an installed system!');

package/dist/commands/kill.js

@@ -8,7 +8,7 @@
 import { Command, Flags } from '@oclif/core';
 import Settings from '../classes/settings.js';
 import Utils from '../classes/utils.js';
-import killMeSoftly from '../lib/kill_me_softly.js';
+import killMeSoftly from '../krill/lib/kill_me_softly.js';
 /**
  *
  */

package/dist/commands/status.js

@@ -6,7 +6,7 @@
  * license: MIT
  */
 import { Command, Flags } from '@oclif/core';
-import Information from '../components/information.js';
+import Information from '../krill/components/information.js';
 /**
  *
  */

package/dist/commands/update.js

@@ -158,17 +158,17 @@ export default class Update extends Command {
         let url = 'https://sourceforge.net/projects/penguins-eggs/files/Packages';
         let filter = `penguins-eggs`;
         if (this.distro.familyId === "debian") {
-            repo = "DEBS";
+            repo = "debs";
             url = `${url}/${repo}/${Utils.uefiArch()}`;
             filter = `penguins-eggs_10.?.*-?_${Utils.uefiArch()}.deb`;
             cmd = `sudo dpkg -i ${filter}`;
         }
         else if (this.distro.familyId === 'archlinux') {
-            repo = "AUR";
+            repo = "aur";
             filter = `penguins-eggs-10.?.*-?-any.pkg.tar.zst`;
             cmd = `sudo pacman -U ${filter}`;
             if (Diversions.isManjaroBased(this.distro.distroId)) {
-                repo = 'MANJARO';
+                repo = 'manjaro';
             }
             url = `${url}/${repo}`;
         }

package/dist/interfaces/i-luks-passphrase.d.ts

@@ -0,0 +1,11 @@
+/**
+ * ./src/interfaces/i-user.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export interface ILuksPassphrase {
+    passphrase: string;
+    confirm: string;
+}

package/dist/interfaces/i-luks-passphrase.js

@@ -0,0 +1,8 @@
+/**
+ * ./src/interfaces/i-user.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+export {};

package/dist/interfaces/index.d.ts

@@ -22,4 +22,5 @@ export { IPartitions } from './i-partitions.js';
 export { IRemix } from './i-remix.js';
 export { ISettings } from './i-settings.js';
 export { IUser } from './i-user.js';
+export { ILuksPassphrase } from './i-luks-passphrase.js';
 export { IWorkDir } from './i-workdir.js';

package/dist/{classes → krill/classes}/cfs.js

@@ -7,7 +7,7 @@
  */
 import yaml from 'js-yaml';
 import fs from 'node:fs';
-import Pacman from './pacman.js';
+import Pacman from '../../classes/pacman.js';
 /**
  * cfs
  */

package/dist/krill/classes/krill_enums.d.ts

@@ -0,0 +1,24 @@
+/**
+ * src/krill/classes/krill-enums.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+/**
+ *
+ */
+export declare enum InstallationMode {
+    Standard = "Erase disk",
+    Luks = "Erase disk/Encrypted",
+    Replace = "Replace partition"
+}
+/**
+ *
+ */
+export declare enum SwapChoice {
+    None = "none",
+    Small = "small",
+    Suspend = "suspend",
+    File = "file"
+}

package/dist/krill/classes/krill_enums.js

@@ -0,0 +1,26 @@
+/**
+ * src/krill/classes/krill-enums.ts
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ */
+/**
+ *
+ */
+export var InstallationMode;
+(function (InstallationMode) {
+    InstallationMode["Standard"] = "Erase disk";
+    InstallationMode["Luks"] = "Erase disk/Encrypted";
+    InstallationMode["Replace"] = "Replace partition";
+})(InstallationMode || (InstallationMode = {}));
+/**
+ *
+ */
+export var SwapChoice;
+(function (SwapChoice) {
+    SwapChoice["None"] = "none";
+    SwapChoice["Small"] = "small";
+    SwapChoice["Suspend"] = "suspend";
+    SwapChoice["File"] = "file";
+})(SwapChoice || (SwapChoice = {}));

package/dist/krill/classes/prepare.d/confirm.d.ts

@@ -0,0 +1,5 @@
+/**
+ * confirm
+ * @returns
+ */
+export declare function confirm(elem: JSX.Element, msg?: string): Promise<boolean>;

package/dist/krill/classes/prepare.d/confirm.js

@@ -0,0 +1,30 @@
+import Utils from '../../../classes/utils.js';
+import { render } from 'ink';
+/**
+ * confirm
+ * @returns
+ */
+export async function confirm(elem, msg = "Confirm") {
+    redraw(elem);
+    const result = JSON.parse(await Utils.customConfirmAbort(msg));
+    let retval = false;
+    if (result.confirm === 'Yes') {
+        retval = true;
+    }
+    else if (result.confirm === 'Abort') {
+        process.exit();
+    }
+    return retval;
+}
+/**
+ * Occorre farglierlo rigenerare a forza
+ * anche quando NON cambiano i dati
+ * forceUpdate
+ */
+function redraw(elem) {
+    let opt = {};
+    opt.patchConsole = true;
+    opt.debug = false;
+    console.clear();
+    render(elem, opt);
+}

package/dist/krill/classes/prepare.d/keyboard.d.ts

@@ -0,0 +1,14 @@
+/**
+ * ./src/krill/prepare.d/keyboard.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import { IKeyboard } from '../../interfaces/i_krill.js';
+import Prepare from '../prepare.js';
+/**
+ * KEYBOARD
+ */
+export declare function keyboard(this: Prepare): Promise<IKeyboard>;

package/dist/krill/classes/prepare.d/keyboard.js

@@ -0,0 +1,62 @@
+/**
+ * ./src/krill/prepare.d/keyboard.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import React from 'react';
+import { confirm } from './confirm.js';
+import Keyboard from '../../components/keyboard.js';
+import selectKeyboardOption from '../../lib/select_keyboard_option.js';
+import selectKeyboardModel from '../../lib/select_keyboard_model.js';
+import selectKeyboardVariant from '../../lib/select_keyboard_variant.js';
+import selectKeyboardLayout from '../../lib/select_keyboard_layout.js';
+/**
+ * KEYBOARD
+ */
+export async function keyboard() {
+    let keyboardModel = this.krillConfig.keyboardModel;
+    if (keyboardModel === '' || keyboardModel === undefined) {
+        keyboardModel = await this.keyboards.getModel();
+    }
+    let keyboardLayout = this.krillConfig.keyboardLayout;
+    if (keyboardLayout === '' || keyboardLayout === undefined) {
+        keyboardLayout = await this.keyboards.getLayout();
+    }
+    let keyboardVariant = this.krillConfig.keyboardVariant;
+    if (keyboardVariant === '' || keyboardVariant === undefined) {
+        keyboardVariant = await this.keyboards.getVariant();
+    }
+    let keyboardOption = this.krillConfig.keyboardOption;
+    if (keyboardOption === '' || keyboardOption === undefined) {
+        keyboardOption = await this.keyboards.getOption();
+    }
+    let keyboardElem;
+    while (true) {
+        keyboardElem = React.createElement(Keyboard, { keyboardModel: keyboardModel, keyboardLayout: keyboardLayout, keyboardVariant: keyboardVariant, keyboardOptions: keyboardOption });
+        if (await confirm(keyboardElem, "Confirm Keyboard datas?")) {
+            break;
+        }
+        else {
+            keyboardModel = 'pc105';
+            keyboardModel = await selectKeyboardModel(keyboardModel);
+            keyboardLayout = 'us';
+            keyboardLayout = await selectKeyboardLayout(keyboardLayout);
+            keyboardVariant = '';
+            keyboardVariant = await selectKeyboardVariant(keyboardLayout);
+            keyboardOption = '';
+            keyboardOption = await selectKeyboardOption(keyboardOption);
+            if (keyboardModel === '') {
+                keyboardModel = 'pc105';
+            }
+        }
+    }
+    return {
+        keyboardModel: keyboardModel,
+        keyboardLayout: keyboardLayout,
+        keyboardVariant: keyboardVariant,
+        keyboardOption: keyboardOption
+    };
+}

package/dist/krill/classes/prepare.d/location.d.ts

@@ -0,0 +1,17 @@
+/**
+ * ./src/krill/prepare.d/welcome.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import { ILocation } from '../../interfaces/i_krill.js';
+import Prepare from '../prepare.js';
+/**
+ *
+ * @param this
+ * @param language
+ * @returns
+ */
+export declare function location(this: Prepare, language: string): Promise<ILocation>;

package/dist/krill/classes/prepare.d/location.js

@@ -0,0 +1,59 @@
+/**
+ * ./src/krill/prepare.d/welcome.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import React from 'react';
+import { confirm } from './confirm.js';
+import Location from '../../components/location.js';
+import selectRegions from '../../lib/select_regions.js';
+import selectZones from '../../lib/select_zones.js';
+import axios from 'axios';
+import shx from 'shelljs';
+/**
+ *
+ * @param this
+ * @param language
+ * @returns
+ */
+export async function location(language) {
+    let region = this.krillConfig.region;
+    if (region === '' || region === undefined) {
+        let region = shx.exec('cut -f1 -d/ < /etc/timezone', { silent: true }).stdout.trim();
+    }
+    let zone = this.krillConfig.zone;
+    if (zone === '' || zone === undefined) {
+        zone = shx.exec('cut -f2 -d/ < /etc/timezone', { silent: true }).stdout.trim();
+    }
+    // Try to auto-configure timezone by internet
+    const url = `https://geoip.kde.org/v1/calamares`;
+    try {
+        const response = await axios.get(url);
+        if (response.statusText === 'OK') {
+            const data = JSON.stringify(response.data);
+            const obj = JSON.parse(data);
+            region = obj.time_zone.substring(0, obj.time_zone.indexOf('/'));
+            zone = obj.time_zone.substring(obj.time_zone.indexOf('/') + 1);
+        }
+    }
+    catch (error) {
+        console.error('error: ' + error);
+    }
+    let locationElem;
+    while (true) {
+        locationElem = React.createElement(Location, { language: language, region: region, zone: zone });
+        if (await confirm(locationElem, "Confirm location datas?")) {
+            break;
+        }
+        region = await selectRegions(region);
+        zone = await selectZones(region);
+    }
+    return {
+        language: language,
+        region: region,
+        zone: zone
+    };
+}

package/dist/krill/classes/prepare.d/network.d.ts

@@ -0,0 +1,14 @@
+/**
+ * ./src/krill/prepare.d/welcome.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import { INet } from '../../../interfaces/index.js';
+import Prepare from '../prepare.js';
+/**
+   * Network
+   */
+export declare function network(this: Prepare): Promise<INet>;

package/dist/krill/classes/prepare.d/network.js

@@ -0,0 +1,68 @@
+/**
+ * ./src/krill/prepare.d/welcome.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import React from 'react';
+import { confirm } from './confirm.js';
+import Network from '../../components/network.js';
+import Utils from '../../../classes/utils.js';
+import selectInterface from '../../lib/select_interface.js';
+import selectAddressType from '../../lib/select_address_type.js';
+import getAddress from '../../lib/get_address.js';
+import getNetmask from '../../lib/get_netmask.js';
+import getGateway from '../../lib/get_gateway.js';
+import getDomain from '../../lib/get_domain.js';
+import getDns from '../../lib/get_dns.js';
+import fs from 'fs';
+/**
+   * Network
+   */
+export async function network() {
+    const i = {};
+    const ifaces = fs.readdirSync('/sys/class/net/');
+    i.iface = await Utils.iface();
+    i.addressType = 'dhcp';
+    i.address = Utils.address();
+    i.netmask = Utils.netmask();
+    i.gateway = Utils.gateway();
+    i.dns = Utils.getDns();
+    i.domain = Utils.getDomain();
+    let dnsString = '';
+    for (let c = 0; c < i.dns.length; c++) {
+        dnsString += i.dns[c].trim();
+        if (c < i.dns.length - 1) {
+            dnsString += '; ';
+        }
+    }
+    let networkElem;
+    while (true) {
+        networkElem = React.createElement(Network, { iface: i.iface, addressType: i.addressType, address: i.address, netmask: i.netmask, gateway: i.gateway, domain: i.domain, dns: dnsString });
+        if (await confirm(networkElem, "Confirm Network datas?")) {
+            break;
+        }
+        i.iface = await selectInterface(i.iface, ifaces);
+        i.addressType = await selectAddressType();
+        if (i.addressType === 'static') {
+            i.address = await getAddress(i.address);
+            i.netmask = await getNetmask(i.netmask);
+            i.gateway = await getGateway(i.gateway);
+            i.domain = await getDomain(i.domain);
+            if (i.domain.at(0) !== '.') {
+                i.domain = '.' + i.domain;
+            }
+            i.dns = (await getDns(dnsString)).split(';');
+            dnsString = '';
+            for (let c = 0; c < i.dns.length; c++) {
+                dnsString += i.dns[c].trim();
+                if (c < i.dns.length - 1) {
+                    dnsString += '; ';
+                }
+            }
+        }
+    }
+    return i;
+}

package/dist/krill/classes/prepare.d/partitions.d.ts

@@ -0,0 +1,14 @@
+/**
+ * ./src/krill/prepare.d/partitions.tsx
+ * penguins-eggs v.10.0.0 / ecmascript 2020
+ * author: Piero Proietti
+ * email: piero.proietti@gmail.com
+ * license: MIT
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import { IPartitions } from '../../interfaces/i_krill.js';
+import Prepare from '../prepare.js';
+/**
+ * PARTITIONS
+ */
+export declare function partitions(this: Prepare, installationDevice?: string, crypted?: boolean, pve?: boolean, btrfs?: boolean): Promise<IPartitions>;