penguins-eggs 10.0.37 → 10.0.40

package/dist/components/install.js

@@ -6,6 +6,7 @@
  * license: MIT
  */
 import React from 'react';
+import Spinner from 'ink-spinner';
 import yaml from 'js-yaml';
 import fs from 'fs';
 import { Box, Newline, Text } from 'ink';
@@ -23,16 +24,16 @@ export default function Install({ message = "Install", percent = 0, spinner = fa
     const calamares = yaml.load(fs.readFileSync(configRoot + 'branding/' + branding + '/branding.desc', 'utf-8'));
     productName = calamares.strings.productName;
     version = calamares.strings.version;
-    let perc = Math.round(percent * 100);
-    let barLen = 52;
-    let progress = Math.round(barLen * percent);
+    let barLen = 53;
+    let progress = Math.round(barLen * percent / 100);
     let todo = barLen - progress;
     let clean = "·".repeat(todo);
-    let progressBar = "[" + "█".repeat(progress) + clean + "] " + perc + "%";
+    let progressBar = "[" + "█".repeat(progress) + clean + "] " + percent + "%";
     /**
      * totale width=75
      * step width=15
      * finestra with=59
+     *                 <Text><Spinner type="simpleDotsScrolling" /></Text>
      */
     return (React.createElement(React.Fragment, null,
         React.createElement(Title, null),
@@ -47,10 +48,13 @@ export default function Install({ message = "Install", percent = 0, spinner = fa
                         React.createElement(Newline, null),
                         React.createElement(Box, { flexDirection: "row" },
                             React.createElement(Text, null, "Step: "),
-                            React.createElement(Text, { color: "cyan" }, message)),
+                            React.createElement(Text, { color: "cyan" },
+                                message,
+                                " "),
+                            spinner && React.createElement(Text, null,
+                                React.createElement(Spinner, { type: "simpleDotsScrolling" }))),
                         React.createElement(Newline, null),
                         React.createElement(Box, null,
-                            React.createElement(Text, null, "Progress:")),
-                        React.createElement(Box, null,
-                            React.createElement(Text, null, progressBar))))))));
+                            React.createElement(Text, null, progressBar)))))),
+        React.createElement(Text, null)));
 }

package/dist/interfaces/i-materia.d.ts

@@ -12,30 +12,25 @@ export interface IRepos {
 }
 export interface IMateria {
     author: string;
-    customize: {
-        dirs: boolean;
-        scripts: string[];
-    };
     description: string;
     distributions: string[];
     name: string;
-    reboot: boolean;
     release: string;
     sequence: {
-        accessories: string[];
-        debs: boolean;
-        packages: string[];
-        packages_no_install_recommends: string[];
-        packages_python: string[];
-        preinst: string[];
         repositories: {
             sources_list: string[];
             sources_list_d: string[];
             update: boolean;
             upgrade: boolean;
         };
-        try_accessories: string[];
-        try_packages: string[];
-        try_packages_no_install_recommends: string[];
+        cmds: string[];
+        packages: string[];
+        packages_python: string[];
+        accessories: string[];
     };
+    finalize: {
+        customize: boolean;
+        cmds: string[];
+    };
+    reboot: boolean;
 }

package/dist/krill/modules/add-user.js

@@ -6,7 +6,6 @@
  * license: MIT
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
-import Utils from '../../classes/utils.js';
 import { exec } from '../../lib/utils.js';
 /**
  *
@@ -25,7 +24,10 @@ export default async function addUser(name = 'live', password = 'evolution', ful
         cmd = `chroot ${this.installTarget} useradd --create-home --shell /bin/bash ${name} ${this.toNull}`;
     }
     else if (this.distro.familyId === 'fedora') {
-        cmd = `chroot ${this.installTarget} adduser ${name} -m --shell /bin/bash --comment "${fullName},${roomNumber},${workPhone},${homePhone}" ${this.toNull}`;
+        cmd = `chroot ${this.installTarget} adduser ${name} --create-home --shell /bin/bash --comment "${fullName},${roomNumber},${workPhone},${homePhone}" ${this.toNull}`;
+    }
+    else if (this.distro.familyId === 'opensuse') {
+        cmd = `chroot ${this.installTarget} useradd ${name} --create-home --shell /bin/bash --comment "${fullName},${roomNumber},${workPhone},${homePhone}" ${this.toNull}`;
     }
     await exec(cmd, this.echo);
     // chpasswd user
@@ -37,15 +39,10 @@ export default async function addUser(name = 'live', password = 'evolution', ful
     }
     cmd = `chroot ${this.installTarget} usermod -aG ${group} ${name} ${this.toNull}`;
     await exec(cmd, this.echo);
-    // autologin
-    try {
-        await exec(cmd, this.echo);
-        if (this.distro.familyId === 'archlinux') {
-            await exec(`chroot ${this.installTarget} getent group autologin || groupadd autologin`);
-            await exec(`chroot ${this.installTarget} gpasswd -a ${this.settings.config.user_opt} autologin`);
-        }
-    }
-    catch {
-        await Utils.pressKeyToExit(cmd);
+    // add autologin group in archlinux
+    await exec(cmd, this.echo);
+    if (this.distro.familyId === 'archlinux') {
+        await exec(`chroot ${this.installTarget} getent group autologin || groupadd autologin`);
+        await exec(`chroot ${this.installTarget} gpasswd -a ${this.settings.config.user_opt} autologin`);
     }
 }

package/dist/krill/modules/bootloader-config.js

@@ -55,6 +55,21 @@ export default async function bootloaderConfig() {
                     await Utils.pressKeyToExit(cmd, true);
                 }
             }
+        }
+        /**
+         * opensuse
+         */
+        case 'opensuse': {
+            if (this.efi) {
+                try {
+                    cmd = `chroot ${this.installTarget} zypper install -y grub2 grub2-i386-pc grub2-x86_64-efi- efibootmgr} ${this.toNull}`;
+                    await exec(cmd, this.echo);
+                }
+                catch (error) {
+                    console.log(error);
+                    await Utils.pressKeyToExit(cmd, true);
+                }
+            }
             else {
                 try {
                     cmd = `chroot ${this.installTarget} apk add grub grub-bios ${this.toNull}`;

package/dist/krill/modules/bootloader.js

@@ -14,7 +14,7 @@ import { exec } from '../../lib/utils.js';
  */
 export default async function bootloader() {
     let grubInstall = 'grub-install';
-    if (this.distro.familyId === 'fedora') {
+    if (this.distro.familyId === 'fedora' || this.distro.familyId === 'opensuse') {
         grubInstall = 'grub2-install';
     }
     let cmd = `chroot ${this.installTarget} ${grubInstall} ${this.partitions.installationDevice} ${this.toNull}`;
@@ -25,7 +25,7 @@ export default async function bootloader() {
         await Utils.pressKeyToExit(cmd);
     }
     cmd = `chroot ${this.installTarget} grub-mkconfig -o /boot/grub/grub.cfg ${this.toNull}`;
-    if (this.distro.familyId === 'fedora') {
+    if (this.distro.familyId === 'fedora' || this.distro.familyId === 'opensuse') {
         cmd = `chroot ${this.installTarget} grub2-mkconfig -o /boot/grub2/grub.cfg ${this.toNull}`;
     }
     try {

package/dist/krill/modules/del-live-user.js

@@ -26,9 +26,10 @@ export default async function delLiveUser() {
         }
         finally {
             if (userExists) {
-                // debian family and alpine
                 let cmd = `chroot ${this.installTarget} deluser --remove-home ${user} ${this.toNull}`;
-                if (this.distro.familyId === 'archlinux' || this.distro.familyId === 'fedora') {
+                if (this.distro.familyId === 'archlinux' ||
+                    this.distro.familyId === 'fedora' ||
+                    this.distro.familyId === 'opensuse') {
                     cmd = `chroot ${this.installTarget} sudo userdel -r ${user} ${this.toNull}`;
                 }
                 await exec(cmd, this.echo);

package/dist/krill/modules/fstab.js

@@ -103,6 +103,8 @@ export default async function fstab(installDevice, crypted = false) {
         text += `# UUID=${Utils.uuid(this.devices.root.name)} ${var_lib_blueman}\n`;
         text += `# UUID=${Utils.uuid(this.devices.root.name)} ${tmp}\n`;
     }
+    //console.log(text)
+    //Utils.pressKeyToExit()
     Utils.write(fstab, text);
 }
 /**

package/dist/krill/modules/initramfs.js

@@ -45,4 +45,14 @@ export default async function initramfs() {
             await Utils.pressKeyToExit(cmd);
         }
     }
+    else if (this.distro.familyId === 'alpine') {
+    }
+    else if (this.distro.familyId === 'fedora') {
+        let cmd = 'dracut';
+        await exec(cmd, Utils.setEcho(true));
+    }
+    else if (this.distro.familyId === 'opensuse') {
+        let cmd = 'dracut';
+        await exec(cmd, Utils.setEcho(true));
+    }
 }

package/dist/krill/modules/locale.js

@@ -42,10 +42,10 @@ export default async function locale() {
         Utils.write(file, content);
         // timezone Arch Debian
         if (fs.existsSync('/etc/localtime')) {
-            const cmd = `chroot ${this.installTarget} unlink /etc/localtime`;
+            const cmd = `chroot ${this.installTarget} unlink /etc/localtime ${this.toNull}`;
             await exec(cmd, this.echo);
         }
-        const cmd = `chroot ${this.installTarget} ln -sf /usr/share/zoneinfo/${this.region}/${this.zone} /etc/localtime`;
+        const cmd = `chroot ${this.installTarget} ln -sf /usr/share/zoneinfo/${this.region}/${this.zone} /etc/localtime ${this.toNull}`;
         await exec(cmd, this.echo);
     }
     else if (this.distro.familyId === 'alpine') {
@@ -79,13 +79,13 @@ export default async function locale() {
          *
          */
         let tz = `/etc/zoneinfo/${this.region}/${this.zone}`;
-        await exec(`chroot ${this.installTarget} rm -rf /etc/zoneinfo/*`, this.echo);
-        await exec(`chroot ${this.installTarget} mkdir -p ${tz}`, this.echo);
+        await exec(`chroot ${this.installTarget} rm -rf /etc/zoneinfo/* ${this.toNull}`, this.echo);
+        await exec(`chroot ${this.installTarget} mkdir -p ${tz} ${this.toNull}`, this.echo);
         file = `${this.installTarget}/etc/profile.d/timezone.sh`;
         content = "";
         content += `#!/bin/sh\n`;
         content += `export TZ='${tz}'`;
         Utils.write(file, content);
-        await exec(`chmod +x ${file}`);
+        await exec(`chmod +x ${file} ${this.toNull}`);
     }
 }

package/dist/krill/modules/m-keyboard.js

@@ -23,7 +23,7 @@ export default async function mKeyboard() {
         let cmd = '';
         let content = '';
         if (Utils.isSystemd()) {
-            cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout}`;
+            cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout} ${this.toNull}`;
             content = '# See penguins-eggs/src/krill/modules/set-keyboard.ts\n\n';
             content += "# Read and parsed by systemd-localed. It's probably wise not to edit this file\n";
             content += '# manually too freely.\n';
@@ -51,21 +51,8 @@ export default async function mKeyboard() {
     }
     else if (this.distro.familyId === 'alpine') {
         /**
-         * https://docs.alpinelinux.org/user-handbook/0.1a/Installing/manual.html
-         */
+        * Alpine dovrebbe fare tutto con `setup-keymap us us`
+        */
         await exec(`chroot ${this.installTarget} setup-keymap ${this.keyboardLayout} ${this.keyboardLayout}`);
-        // X11
-        let content = "";
-        content += `Section "InputClass"\n`;
-        content += `Identifier "system-keyboard"\n`;
-        content += `MatchIsKeyboard "on"\n`;
-        content += `Option "XkbLayout" "${this.keyboardLayout}"\n`;
-        content += `Option "XkbModel" "${this.keyboardModel}"\n`;
-        content += `EndSection\n`;
-        let file = "/etc/X11/xorg.conf.d/00-keyboard.conf";
-        if (fs.existsSync(this.installTarget + '/etc/X11/xorg.conf.d')) {
-            Utils.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
-        }
-        // Wayland TO DO
     }
 }

package/dist/krill/modules/machine-id.js

@@ -17,14 +17,14 @@ export default async function machineId() {
     // We delete the machine-id file to force its recreation
     const file = `${this.installTarget}/etc/machine-id`;
     if (fs.existsSync(file)) {
-        await exec(`rm ${file}`, this.echo);
+        await exec(`rm ${file} ${this.toNull}`, this.echo);
     }
     // On Alpine, we need to create the machine-id file
     if (this.distro.familyId === 'alpine') {
-        await exec(`dbus-uuidgen > ${this.installTarget}/var/lib/dbus/machine-id`);
+        await exec(`dbus-uuidgen --ensure=${this.installTarget}/var/lib/dbus/machine-id ${this.toNull}`);
         await exec(`cp ${this.installTarget}/var/lib/dbus/machine-id ${this.installTarget}/etc/machine-id`);
     }
     else {
-        await exec(`touch ${file}`);
+        await exec(`touch ${file} ${this.toNull}`);
     }
 }

package/dist/krill/modules/mkfs.d.ts

@@ -9,5 +9,7 @@
 import Sequence from '../sequence.js';
 /**
  * mkfs
+ *
+ * mke2fs - create an ext2/ext3/ext4 file system -F force, -t type
  */
 export default function mkfs(this: Sequence): Promise<boolean>;

package/dist/krill/modules/mkfs.js

@@ -9,6 +9,8 @@
 import { exec } from '../../lib/utils.js';
 /**
  * mkfs
+ *
+ * mke2fs - create an ext2/ext3/ext4 file system -F force, -t type
  */
 export default async function mkfs() {
     const result = true;

package/dist/krill/modules/unpackfs.js

@@ -13,7 +13,8 @@ import { exec } from '../../lib/utils.js';
  */
 export default async function unpackfs() {
     // const cmd = `unsquashfs -d ${this.installTarget} -f ${this.distro.liveMediumPath}`
-    const cmd = `unsquashfs -d ${this.installTarget} -f ${this.distro.liveMediumPath}${this.distro.squashfs}`;
+    const cmd = `unsquashfs -d ${this.installTarget} -f ${this.distro.liveMediumPath}${this.distro.squashfs} ${this.toNull}`;
     const echoYes = Utils.setEcho(true);
-    await exec(cmd, echoYes);
+    const echoNo = Utils.setEcho(false);
+    await exec(cmd, echoNo);
 }

package/dist/krill/sequence.d.ts

@@ -6,10 +6,6 @@
  * license: MIT
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
-/**
- * Note: I'm using REACT here to get a TUI,
- *       via ink library https://github.com/vadimdemedes/ink
- */
 /**
  * Ideally, I want to respect calamares way, remplementing the same (SEMPLIFIED) steps for CLI
  *
@@ -115,6 +111,7 @@ export default class Sequence {
     keyboardLayout: string;
     keyboardVariant: string;
     toNull: string;
+    spinner: boolean;
     settings: Settings;
     remix: IRemix;
     distro: IDistro;
@@ -145,7 +142,13 @@ export default class Sequence {
      */
     execCalamaresModule(name: string): Promise<void>;
     /**
-     * only show the result
+     *
+    * @param message
+    */
+    emergencyShell(message: string): Promise<void>;
+    /**
+     *
+     * @param message
      */
-    finished(): Promise<void>;
+    showProblem(message: string, currErr: any): Promise<void>;
 }