penguins-eggs 9.1.31 → 9.1.37

package/lib/krill/modules/remove-installer-link.js

@@ -0,0 +1,34 @@
+"use strict";
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+/**
+   * removeInstallerLink
+   */
+async function removeInstallerLink() {
+    let file = `${this.installTarget}/usr/bin/penguins-links-add.sh`;
+    let lines = [];
+    let content = '';
+    if (fs_1.default.existsSync(file)) {
+        lines = fs_1.default.readFileSync(file, { encoding: 'utf8', flag: 'r' }).split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i]) {
+                if (lines[i].search('penguins-krill.desktop') !== -1) {
+                    lines[i] += '#';
+                }
+                if (lines[i].search('penguins-clinstaller.desktop') !== -1) {
+                    lines[i] += '#';
+                }
+                if (lines[i].search('install-debian.desktop') !== -1) {
+                    lines[i] += '#';
+                }
+                content += lines[i] + '\n';
+            }
+        }
+    }
+    fs_1.default.writeFileSync(file, content);
+}
+exports.default = removeInstallerLink;

package/lib/krill/modules/set-keyboard.d.ts

@@ -0,0 +1,5 @@
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import Sequence from '../krill-sequence';
+export default function setKeyboard(this: Sequence): Promise<void>;

package/lib/krill/modules/set-keyboard.js

@@ -0,0 +1,50 @@
+"use strict";
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const utils_2 = require("../../lib/utils");
+async function setKeyboard() {
+    /**
+    * influence: - /etc/default/keyboard (x11)
+    *            - /etc/vconsole.conf (console)
+    *            - /etc/X11/xorg.conf.d/00-keyboard.conf
+    *
+    * Problem: Actually don't update /etc/default/keyboard (x11)s
+    *          /etc/vconsole.conf is update in installed syste,
+    */
+    // systemd as default
+    let cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout}`;
+    if (!utils_1.default.isSystemd()) {
+        cmd = `chroot ${this.installTarget} setupcon ${this.toNull}`;
+    }
+    try {
+        await (0, utils_2.exec)(cmd, this.echo);
+    }
+    catch (error) {
+        console.log(error);
+        utils_1.default.pressKeyToExit(cmd, true);
+    }
+    /**
+     * this must to be not necessary but...
+     *
+     * force change /etc/default/keyboard (x11)
+     * force change /etc/vconsole.conf
+     */
+    let content = '# KEYBOARD CONFIGURATION FILE\n\n';
+    content += '# Consult the keyboard(5) manual page.\n\n';
+    content += 'XKBMODEL="' + this.keyboardModel + '"\n';
+    content += 'XKBLAYOUT="' + this.keyboardLayout + '"\n';
+    content += 'XKBVARIANT="' + this.keyboardVariant + '"\n';
+    content += 'XKBOPTIONS=""\n';
+    content += '\n';
+    content += 'BACKSPACE="guess"\n';
+    // Utils.write(this.installTarget + '/etc/default/keyboard', content)
+    content = 'KEYMAP=' + +this.keyboardModel + '"\n';
+    content += 'FONT=\n';
+    content += 'FONT_MAP=\n';
+    // Utils.write(this.installTarget + '/etc/vconsole.conf', content)
+}
+exports.default = setKeyboard;

package/lib/krill/modules/set-timezone.d.ts

@@ -0,0 +1,9 @@
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import Sequence from '../krill-sequence';
+/**
+ *
+ * @param this
+ */
+export default function setTimezone(this: Sequence): Promise<void>;

package/lib/krill/modules/set-timezone.js

@@ -0,0 +1,21 @@
+"use strict";
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const utils_1 = require("../../lib/utils");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+/**
+ *
+ * @param this
+ */
+async function setTimezone() {
+    if (fs_1.default.existsSync('/etc/localtime')) {
+        const cmd = `chroot ${this.installTarget} unlink /etc/localtime`;
+        await (0, utils_1.exec)(cmd, this.echo);
+    }
+    const cmd = `chroot ${this.installTarget} ln -sf /usr/share/zoneinfo/${this.region}/${this.zone} /etc/localtime`;
+    await (0, utils_1.exec)(cmd, this.echo);
+}
+exports.default = setTimezone;

package/lib/krill/modules/umount.d.ts

@@ -0,0 +1,9 @@
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import Sequence from '../krill-sequence';
+/**
+*
+* @param mountpoint
+*/
+export default function umount(this: Sequence, mountPoint?: string): Promise<void>;

package/lib/krill/modules/umount.js

@@ -0,0 +1,26 @@
+"use strict";
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const utils_2 = require("../../lib/utils");
+/**
+*
+* @param mountpoint
+*/
+async function umount(mountPoint = '') {
+    let message = 'umount: ' + mountPoint;
+    if (utils_1.default.isMountpoint(mountPoint)) {
+        try {
+            await (0, utils_2.exec)(`umount ${mountPoint} ${this.toNull}`, this.echo);
+            await (0, utils_2.exec)('sleep 1', this.echo);
+        }
+        catch (error) {
+            message += +mountPoint + JSON.stringify(error);
+            await utils_1.default.pressKeyToExit(message);
+        }
+    }
+}
+exports.default = umount;

package/lib/krill/modules/unpackfs.d.ts

@@ -0,0 +1,8 @@
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+import Sequence from '../krill-sequence';
+/**
+* unpackfs
+*/
+export default function unpackfs(this: Sequence): Promise<void>;

package/lib/krill/modules/unpackfs.js

@@ -0,0 +1,17 @@
+"use strict";
+/**
+ * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const utils_2 = require("../../lib/utils");
+/**
+* unpackfs
+*/
+async function unpackfs() {
+    const cmd = `unsquashfs -d ${this.installTarget} -f ${this.distro.mountpointSquashFs}`;
+    const echoYes = utils_1.default.setEcho(true);
+    await (0, utils_2.exec)(cmd, echoYes);
+}
+exports.default = unpackfs;

package/lib/lib/cli-autologin.js

@@ -110,13 +110,13 @@ exports.remove = remove;
  */
 async function addMotd(distro, version, user, userPasswd, rootPasswd, chroot = '/') {
     const fileMotd = `${chroot}/etc/motd`;
-    let installer = 'sudo eggs install';
+    let installer = 'sudo eggs krill';
     if (pacman_1.default.packageIsInstalled('calamares')) {
         if (pacman_1.default.packageIsInstalled('plasma-desktop')) {
-            installer = 'startplasma-wayland to run GUI and launch calamares, or from terminal sudo eggs install -c';
+            installer = 'startplasma-wayland to run GUI and launch calamares, or from terminal sudo eggs krill -c';
         }
         else if (pacman_1.default.packageIsInstalled('xfce4')) {
-            installer = 'startxfce4 to run GUI and launch calamares, or from terminal sudo eggs install -c';
+            installer = 'startxfce4 to run GUI and launch calamares, or from terminal sudo eggs krill -c';
         }
     }
     if (!fs_1.default.existsSync(fileMotd)) {

package/lib/lib/select_keyboard_variant.js

@@ -15,6 +15,7 @@ async function selectKeyboardVariant(keyboardLayout = '') {
     const keyboards = new keyboards_1.default();
     const variants = keyboards.getVariants(keyboardLayout);
     const supported = [];
+    supported.push(''); // inserisce una varian nulla
     for (const v of variants) {
         supported.push(v.code);
     }

package/lib/lib/utils.d.ts

@@ -7,10 +7,37 @@
  *                           Set `capture` to TRUE, to capture and return stdout.
  *
  * @returns {Promise<{code: number, data: string | undefined, error: Object}>}
+ *
+ * https://github.com/oclif/core/issues/453#issuecomment-1200778612
+ * codespool:
+ * You could wrap spawn in a promise, listen to exit event, and resolve when it happens. That should play nicely with oclif/core.
+ * We are using it here:
+ * https://github.com/AstarNetwork/swanky-cli/blob/master/src/commands/compile/index.ts
  */
 import { IExec } from '../interfaces';
+/**
+ *
+ * @param command
+ * @param param1
+ * @returns
+ */
 export declare function exec(command: string, { echo, ignore, capture }?: {
     echo?: boolean | undefined;
     ignore?: boolean | undefined;
     capture?: boolean | undefined;
 }): Promise<IExec>;
+/**
+  * Il problema è in questa funzione: core/cli-ux/indesx.ts
+  * qui riportata solo come esempio
+  *
+function timeout(p: Promise<any>, ms: number) {
+  function wait(ms: number, unref = false) {
+    return new Promise(resolve => {
+      const t: any = setTimeout(() => resolve(null), ms)
+      if (unref) t.unref()
+    })
+  }
+
+  return Promise.race([p, wait(ms, true).then(() => ux.error('timed out'))])
+}
+*/

package/lib/lib/utils.js

@@ -8,37 +8,72 @@
  *                           Set `capture` to TRUE, to capture and return stdout.
  *
  * @returns {Promise<{code: number, data: string | undefined, error: Object}>}
+ *
+ * https://github.com/oclif/core/issues/453#issuecomment-1200778612
+ * codespool:
+ * You could wrap spawn in a promise, listen to exit event, and resolve when it happens. That should play nicely with oclif/core.
+ * We are using it here:
+ * https://github.com/AstarNetwork/swanky-cli/blob/master/src/commands/compile/index.ts
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = void 0;
-function exec(command, { echo = false, ignore = false, capture = false } = {}) {
-    if (echo) {
-        console.log(command);
-    }
-    const spawn = require('child_process').spawn;
-    // const childProcess = spawn('bash', ['-c', command], { stdio: capture ? 'pipe' : 'inherit' });
-    // const childProcess = spawn('bash', ['-c', command], { stdio: capture ? 'pipe' : ignore ? 'ignore' : 'inherit' });
-    const childProcess = spawn('bash', ['-c', command], {
-        stdio: ignore ? 'ignore' : capture ? 'pipe' : 'inherit'
-    });
+const child_process_1 = require("child_process");
+/**
+ *
+ * @param command
+ * @param param1
+ * @returns
+ */
+async function exec(command, { echo = false, ignore = false, capture = false } = {}) {
+    /**
+     * You could wrap spawn in a promise,
+     * listen to exit event,
+     * and resolve when it happens.
+     *
+     * That should play nicely with oclif/core.
+     */
     return new Promise((resolve, reject) => {
+        var _a;
+        if (echo) {
+            console.log(command);
+        }
+        const child = (0, child_process_1.spawn)('bash', ['-c', command], {
+            stdio: ignore ? 'ignore' : capture ? 'pipe' : 'inherit'
+        });
+        // const spawn = require('child_process').spawn
+        // child.stdout.on('data', (data: string) => {
         let stdout = '';
         if (capture) {
-            childProcess.stdout.on('data', (data) => {
+            (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                 stdout += data;
             });
         }
-        childProcess.on('error', function (error) {
+        // 'error' event
+        child.on('error', function (error) {
             reject({ code: 1, error: error });
         });
-        childProcess.on('close', function (code) {
-            if (code > 0) {
-                reject({ code: code, error: 'Command failed with code ' + code });
-            }
-            else {
-                resolve({ code: code, data: stdout });
-            }
+        // The 'exit' event is emitted after the child process ends. If the process exited, code is the final exit code of the process, 
+        // otherwise null. If the process terminated due to receipt of a signal, signal is the string name of the signal, otherwise null. 
+        // One of the two will always be non-null.
+        child.on('exit', (code) => {
+            resolve({ code: code, data: stdout });
         });
+        // end promise
     });
 }
 exports.exec = exec;
+/**
+  * Il problema è in questa funzione: core/cli-ux/indesx.ts
+  * qui riportata solo come esempio
+  *
+function timeout(p: Promise<any>, ms: number) {
+  function wait(ms: number, unref = false) {
+    return new Promise(resolve => {
+      const t: any = setTimeout(() => resolve(null), ms)
+      if (unref) t.unref()
+    })
+  }
+
+  return Promise.race([p, wait(ms, true).then(() => ux.error('timed out'))])
+}
+*/