penguins-eggs 9.3.26 → 9.3.27

package/dist/krill/modules/bootloader.js

@@ -15,14 +15,14 @@ async function bootloader() {
     try {
         await (0, utils_1.exec)(cmd, this.echo);
     }
-    catch (error) {
+    catch {
         await utils_2.default.pressKeyToExit(cmd);
     }
     cmd = `chroot ${this.installTarget} grub-mkconfig -o /boot/grub/grub.cfg ${this.toNull}`;
     try {
         await (0, utils_1.exec)(cmd, this.echo);
     }
-    catch (error) {
+    catch {
         await utils_2.default.pressKeyToExit(cmd);
     }
 }

package/dist/krill/modules/fstab.js

@@ -18,24 +18,24 @@ const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
 async function fstab(installDevice, crypted = false) {
     let text = '';
     /**
-     * crypttab
-     */
+       * crypttab
+       */
     if (this.partitions.installationMode === 'full-encrypted') {
         const crypttab = this.installTarget + '/etc/crypttab';
-        text = ``;
-        text += `# /etc/crypttab: mappings for encrypted partitions.\n`;
-        text += `#\n`;
-        text += `# Each mapped device will be created in /dev/mapper, so your /etc/fstab\n`;
-        text += `# should use the /dev/mapper/<name> paths for encrypted devices.\n`;
-        text += `#\n`;
-        text += `# See crypttab(5) for the supported syntax.\n`;
-        text += `#\n`;
-        text += `# NOTE: You need not list your root (/) partition here, but it must be set up\n`;
-        text += `#       beforehand by the initramfs (/etc/mkinitcpio.conf). The same applies\n`;
-        text += `#       to encrypted swap, which should be set up with mkinitcpio-openswap\n`;
-        text += `#       for resume support.\n`;
-        text += `#\n`;
-        text += `# <name>               <device>                         <password> <options>\n`;
+        text = '';
+        text += '# /etc/crypttab: mappings for encrypted partitions.\n';
+        text += '#\n';
+        text += '# Each mapped device will be created in /dev/mapper, so your /etc/fstab\n';
+        text += '# should use the /dev/mapper/<name> paths for encrypted devices.\n';
+        text += '#\n';
+        text += '# See crypttab(5) for the supported syntax.\n';
+        text += '#\n';
+        text += '# NOTE: You need not list your root (/) partition here, but it must be set up\n';
+        text += '#       beforehand by the initramfs (/etc/mkinitcpio.conf). The same applies\n';
+        text += '#       to encrypted swap, which should be set up with mkinitcpio-openswap\n';
+        text += '#       for resume support.\n';
+        text += '#\n';
+        text += '# <name>               <device>                         <password> <options>\n';
         text += `#swap_crypted was ${this.devices.swap.cryptedFrom}\n`;
         text += `swap_crypted UUID=${utils_1.default.uuid(this.devices.swap.cryptedFrom)} none luks,discard\n`;
         text += `#root_crypted was ${this.devices.root.cryptedFrom}\n`;
@@ -45,7 +45,7 @@ async function fstab(installDevice, crypted = false) {
     const fstab = this.installTarget + '/etc/fstab';
     let mountOptsRoot = '';
     let mountOptsBoot = '';
-    let mountOptsData = ``;
+    let mountOptsData = '';
     let mountOptsEfi = '';
     let mountOptsSwap = '';
     if (await isRotational(installDevice)) {
@@ -62,14 +62,14 @@ async function fstab(installDevice, crypted = false) {
         mountOptsEfi = 'defaults,noatime 0 2';
         mountOptsSwap = 'defaults,noatime 0 2';
     }
-    text = ``;
+    text = '';
     text += `# ${this.devices.root.name} ${this.devices.root.mountPoint} ${this.devices.root.fsType} ${mountOptsRoot}\n`;
     text += `UUID=${utils_1.default.uuid(this.devices.root.name)} ${this.devices.root.mountPoint} ${this.devices.root.fsType} ${mountOptsRoot}\n`;
-    if (this.devices.boot.name !== `none`) {
+    if (this.devices.boot.name !== 'none') {
         text += `# ${this.devices.boot.name} ${this.devices.boot.mountPoint} ${this.devices.boot.fsType} ${mountOptsBoot}\n`;
         text += `UUID=${utils_1.default.uuid(this.devices.boot.name)} ${this.devices.boot.mountPoint} ${this.devices.root.fsType} ${mountOptsBoot}\n`;
     }
-    if (this.devices.data.name !== `none`) {
+    if (this.devices.data.name !== 'none') {
         text += `# ${this.devices.data.name} ${this.devices.data.mountPoint} ${this.devices.data.fsType} ${mountOptsData}\n`;
         text += `UUID=${utils_1.default.uuid(this.devices.data.name)} ${this.devices.data.mountPoint} ${this.devices.data.fsType} ${mountOptsData}\n`;
     }
@@ -87,7 +87,7 @@ exports.default = fstab;
  * @param device
  */
 async function isRotational(device) {
-    device = device.substring(4);
+    device = device.slice(4);
     let response;
     let retVal = false;
     response = shelljs_1.default.exec(`cat /sys/block/${device}/queue/rotational`, { silent: true }).stdout.trim();

package/dist/krill/modules/grubcfg.js

@@ -19,7 +19,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
     * 's/GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=/g'
     */
 async function grubcfg() {
-    let file = `${this.installTarget}/etc/default/grub`;
+    const file = `${this.installTarget}/etc/default/grub`;
     let content = '';
     const grubs = fs_1.default.readFileSync(file, 'utf-8').split('\n');
     for (let i = 0; i < grubs.length; i++) {

package/dist/krill/modules/hostname.js

@@ -14,20 +14,20 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
  * hostname
  */
 async function hostname(domain = 'local') {
-    let hostname = this.users.hostname;
+    const hostname = this.users.hostname;
     /**
-     * hostname
-     */
+       * hostname
+       */
     {
-        let file = this.installTarget + '/etc/hostname';
-        let text = hostname;
+        const file = this.installTarget + '/etc/hostname';
+        const text = hostname;
         fs_1.default.writeFileSync(file, text);
     }
     /**
-     * hosts
-     */
+       * hosts
+       */
     {
-        let file = this.installTarget + '/etc/hosts';
+        const file = this.installTarget + '/etc/hosts';
         let text = '127.0.0.1 localhost localhost.localdomain\n';
         if (this.network.addressType === 'static') {
             text += `${this.network.address} ${hostname} pvelocalhost\n`;
@@ -35,13 +35,13 @@ async function hostname(domain = 'local') {
         else {
             text += `127.0.1.1 ${hostname}.${domain} ${hostname} \n`;
         }
-        text += `# The following lines are desirable for IPv6 capable hosts\n`;
-        text += `:: 1     ip6 - localhost ip6 - loopback\n`;
-        text += `fe00:: 0 ip6 - localnet\n`;
-        text += `ff00:: 0 ip6 - mcastprefix\n`;
-        text += `ff02:: 1 ip6 - allnodes\n`;
-        text += `ff02:: 2 ip6 - allrouters\n`;
-        text += `ff02:: 3 ip6 - allhosts\n`;
+        text += '# The following lines are desirable for IPv6 capable hosts\n';
+        text += ':: 1     ip6 - localhost ip6 - loopback\n';
+        text += 'fe00:: 0 ip6 - localnet\n';
+        text += 'ff00:: 0 ip6 - mcastprefix\n';
+        text += 'ff02:: 1 ip6 - allnodes\n';
+        text += 'ff02:: 2 ip6 - allrouters\n';
+        text += 'ff02:: 3 ip6 - allhosts\n';
         fs_1.default.writeFileSync(file, text);
     }
 }

package/dist/krill/modules/initramfs.js

@@ -21,20 +21,20 @@ async function initramfs() {
         try {
             await (0, utils_1.exec)(cmd, this.echo);
         }
-        catch (error) {
+        catch {
             await utils_2.default.pressKeyToExit(cmd);
         }
         cmd = `chroot ${this.installTarget} mv ~/initrd.img-$(uname -r) /boot ${this.toNull}`;
         try {
             await (0, utils_1.exec)(cmd, this.echo);
         }
-        catch (error) {
+        catch {
             await utils_2.default.pressKeyToExit(cmd);
         }
     }
     else if (this.distro.familyId === 'archlinux') {
         let initrdImg = utils_2.default.initrdImg();
-        initrdImg = initrdImg.substring(initrdImg.lastIndexOf('/') + 1);
+        initrdImg = initrdImg.slice(Math.max(0, initrdImg.lastIndexOf('/') + 1));
         let cmd = `mkinitcpio -c ${path_1.default.resolve(__dirname, '../../../mkinitcpio/arch/mkinitcpio-install.conf')} -g ${this.installTarget}/boot/${initrdImg}`; // ${this.toNull}
         if (this.distro.codenameId === 'Qonos' || this.distro.codenameId === 'Ruah' || this.distro.codenameId === 'Sikaris') {
             cmd = `mkinitcpio -c ${path_1.default.resolve(__dirname, '../../../mkinitcpio/manjaro/mkinitcpio-install.conf')} -g ${this.installTarget}/boot/${initrdImg}`; // ${this.toNull}
@@ -42,7 +42,7 @@ async function initramfs() {
         try {
             await (0, utils_1.exec)(cmd, utils_2.default.setEcho(true));
         }
-        catch (error) {
+        catch {
             await utils_2.default.pressKeyToExit(cmd);
         }
     }

package/dist/krill/modules/locale-cfg.js

@@ -17,29 +17,29 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 */
 async function localeCfg() {
     /**
-     * influence: - locale-gen
-     */
+      * influence: - locale-gen
+      */
     let supporteds = [];
     if (this.distro.familyId === 'debian') {
         // Format: en_US.UTF-8 UTF-8
         supporteds = fs_1.default.readFileSync('/usr/share/i18n/SUPPORTED', 'utf-8').split('\n');
     }
     else if (this.distro.familyId === 'archlinux') {
-        // shx.exec('localectl list-locales > /tmp/SUPPORTED') // with await exec don't work! 
+        // shx.exec('localectl list-locales > /tmp/SUPPORTED') // with await exec don't work!
         const supportedsSource = fs_1.default.readFileSync('/etc/locale.gen', 'utf-8').split('\n');
-        // Original Format: #en_US.UTF-8 UTF-8  
+        // Original Format: #en_US.UTF-8 UTF-8
         for (let line of supportedsSource) {
-            if (line.substring(0, 2) !== "# ") { // se non è un commento
-                line = line.substring(1); // Rimuove #
+            if (line.slice(0, 2) !== '# ') { // se non è un commento
+                line = line.slice(1); // Rimuove #
             }
             supporteds.push(line);
         }
-        // Format: en_US.UTF-8 UTF-8  
+        // Format: en_US.UTF-8 UTF-8
     }
     const localeGenSource = fs_1.default.readFileSync(`${this.installTarget}/etc/locale.gen`, 'utf-8').split('\n');
     let localeGenDest = '';
     const krillBookmark = '#   Locales enabled by krill\n';
-    for (let line of localeGenSource) {
+    for (const line of localeGenSource) {
         if (line.includes(krillBookmark)) {
             break;
         }

package/dist/krill/modules/locale.js

@@ -15,14 +15,14 @@ const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
    */
 async function locale() {
     /**
-     * influcence: - /etc/default/locale
-     *             - /etc/locale.conf
-     *             - /etc/timezone
-     */
-    let defaultLocale = this.language;
+       * influcence: - /etc/default/locale
+       *             - /etc/locale.conf
+       *             - /etc/timezone
+       */
+    const defaultLocale = this.language;
     // /etc/default/locale
     let file = this.installTarget + '/etc/default/locale';
-    let content = ``;
+    let content = '';
     content += `LANG=${defaultLocale}\n`;
     content += `LC_CTYPE=${defaultLocale}\n`;
     content += `LC_NUMERIC=${defaultLocale}\n`;

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

@@ -18,13 +18,13 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
  */
 async function mKeyboard() {
     /**
-    * 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)
-    *          /etc/vconsole.conf is update in installed systems
-    */
+      * 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)
+      *          /etc/vconsole.conf is update in installed systems
+      */
     // systemd as default
     let cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout}`;
     if (!utils_1.default.isSystemd()) {
@@ -38,12 +38,12 @@ async function mKeyboard() {
         utils_1.default.pressKeyToExit(cmd, true);
     }
     /**
-     * this must to be not necessary but...
-     *
-    * force change /etc/default/keyboard (x11)
-    * force change /etc/vconsole.conf
-    * force change /etc/X11/xorg.conf.d/00-keyboard.conf
-    */
+       * this must to be not necessary but...
+       *
+      * force change /etc/default/keyboard (x11)
+      * force change /etc/vconsole.conf
+      * force change /etc/X11/xorg.conf.d/00-keyboard.conf
+      */
     if (utils_1.default.isSystemd()) {
         let content = '# KEYBOARD CONFIGURATION FILE\n\n';
         content += '# Consult the keyboard(5) manual page.\n\n';
@@ -61,13 +61,13 @@ async function mKeyboard() {
         content += 'FONT_MAP=\n';
         utils_1.default.write(this.installTarget + '/etc/vconsole.conf', content);
         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`;
-        content += `Section "InputClass"\n`;
-        content += `        Identifier "system-keyboard"\n`;
-        content += `        MatchIsKeyboard "on"\n`;
-        content += `        Option "XkbLayout" "` + this.keyboardLayout + `"\n`;
-        content += `EndSection\n`;
+        content += '# Read and parsed by systemd-localed. It\'s probably wise not to edit this file\n';
+        content += '# manually too freely.\n';
+        content += 'Section "InputClass"\n';
+        content += '        Identifier "system-keyboard"\n';
+        content += '        MatchIsKeyboard "on"\n';
+        content += '        Option "XkbLayout" "' + this.keyboardLayout + '"\n';
+        content += 'EndSection\n';
         // Not always exist /etc/X11/xorg.conf.d
         if (fs_1.default.existsSync(this.installTarget + '/etc/X11/xorg.conf.d')) {
             utils_1.default.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);

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

@@ -17,7 +17,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
  * https://unix.stackexchange.com/questions/402999/is-it-ok-to-change-etc-machine-id
  */
 async function machineId() {
-    let file = `${this.installTarget}/etc/machine-id`;
+    const file = `${this.installTarget}/etc/machine-id`;
     if (fs_1.default.existsSync(file)) {
         await (0, utils_1.exec)(`rm ${file}`, this.echo);
     }

package/dist/krill/modules/mkfs.js

@@ -19,7 +19,7 @@ async function mkfs() {
     }
     if (this.devices.boot.name !== 'none') {
         if (this.devices.boot.fsType === undefined) {
-            this.devices.boot.fsType = `ext2`;
+            this.devices.boot.fsType = 'ext2';
             this.devices.boot.mountPoint = '/boot';
         }
         await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.boot.fsType} ${this.devices.boot.name} ${this.toNull}`, this.echo);

package/dist/krill/modules/mount-fs.js

@@ -24,23 +24,21 @@ async function mountFs() {
     await (0, utils_1.exec)(`tune2fs -c 0 -i 0 ${this.devices.root.name} ${this.toNull}`, this.echo);
     await (0, utils_1.exec)(`rm -rf ${this.installTarget}/lost+found ${this.toNull}`, this.echo);
     // boot
-    if (this.devices.boot.name !== `none`) {
+    if (this.devices.boot.name !== 'none') {
         await (0, utils_1.exec)(`mkdir ${this.installTarget}/boot -p ${this.toNull}`, this.echo);
         await (0, utils_1.exec)(`mount ${this.devices.boot.name} ${this.installTarget}${this.devices.boot.mountPoint} ${this.toNull}`, this.echo);
         await (0, utils_1.exec)(`tune2fs -c 0 -i 0 ${this.devices.boot.name} ${this.toNull}`, this.echo);
     }
     // data
-    if (this.devices.data.name !== `none`) {
+    if (this.devices.data.name !== 'none') {
         await (0, utils_1.exec)(`mkdir ${this.installTarget}${this.devices.data.mountPoint} -p ${this.toNull}`, this.echo);
         await (0, utils_1.exec)(`mount ${this.devices.data.name} ${this.installTarget}${this.devices.data.mountPoint} ${this.toNull}`, this.echo);
         await (0, utils_1.exec)(`tune2fs -c 0 -i 0 ${this.devices.data.name} ${this.toNull}`, this.echo);
     }
     // efi
-    if (this.efi) {
-        if (!fs_1.default.existsSync(this.installTarget + this.devices.efi.mountPoint)) {
-            await (0, utils_1.exec)(`mkdir ${this.installTarget}${this.devices.efi.mountPoint} -p ${this.toNull}`, this.echo);
-            await (0, utils_1.exec)(`mount ${this.devices.efi.name} ${this.installTarget}${this.devices.efi.mountPoint} ${this.toNull}`, this.echo);
-        }
+    if (this.efi && !fs_1.default.existsSync(this.installTarget + this.devices.efi.mountPoint)) {
+        await (0, utils_1.exec)(`mkdir ${this.installTarget}${this.devices.efi.mountPoint} -p ${this.toNull}`, this.echo);
+        await (0, utils_1.exec)(`mount ${this.devices.efi.name} ${this.installTarget}${this.devices.efi.mountPoint} ${this.toNull}`, this.echo);
     }
     return true;
 }
@@ -54,11 +52,11 @@ async function umountFs() {
         await this.umount(this.devices.efi.name);
     }
     // data
-    if (this.devices.data.name !== `none`) {
+    if (this.devices.data.name !== 'none') {
         await this.umount(this.devices.data.name);
     }
     // boot
-    if (this.devices.boot.name !== `none`) {
+    if (this.devices.boot.name !== 'none') {
         await this.umount(this.devices.boot.name);
     }
     // root

package/dist/krill/modules/network-cfg.js

@@ -21,26 +21,24 @@ const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
  * - manjaro: ? // ip address add 192.168.61/24 + dev enp6s18
  */
 async function networkCfg() {
-    if (this.distro.familyId === 'debian') {
-        // if netplan, don't create entries in /etc/network/interfaces
-        if (!pacman_1.default.packageIsInstalled('netplan.io')) {
-            const file = this.installTarget + '/etc/network/interfaces';
-            let content = '# created by eggs\n\n';
-            content += 'auto lo\n';
-            content += 'iface lo inet loopback\n\n';
-            content += 'auto ' + this.network.iface + '\n';
-            content += 'iface ' + this.network.iface + ' inet ' + this.network.addressType + '\n';
-            if (this.network.addressType !== 'dhcp') {
-                content += '    address ' + this.network.address + '\n';
-                content += '    netmask ' + this.network.netmask + '\n';
-                content += '    gateway ' + this.network.gateway + '\n';
-            }
-            utils_1.default.write(file, content);
+    if (this.distro.familyId === 'debian' && // if netplan, don't create entries in /etc/network/interfaces
+        !pacman_1.default.packageIsInstalled('netplan.io')) {
+        const file = this.installTarget + '/etc/network/interfaces';
+        let content = '# created by eggs\n\n';
+        content += 'auto lo\n';
+        content += 'iface lo inet loopback\n\n';
+        content += 'auto ' + this.network.iface + '\n';
+        content += 'iface ' + this.network.iface + ' inet ' + this.network.addressType + '\n';
+        if (this.network.addressType !== 'dhcp') {
+            content += '    address ' + this.network.address + '\n';
+            content += '    netmask ' + this.network.netmask + '\n';
+            content += '    gateway ' + this.network.gateway + '\n';
         }
+        utils_1.default.write(file, content);
     }
     /**
-     * resolv.conf
-     */
+       * resolv.conf
+       */
     if (this.network.addressType !== 'dhcp') {
         const file = this.installTarget + '/etc/resolv.conf';
         let content = '# created by eggs\n\n';

package/dist/krill/modules/packages.js

@@ -19,7 +19,7 @@ const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
  * @param this
  */
 async function packages() {
-    let echoYes = utils_2.default.setEcho(true);
+    const echoYes = utils_2.default.setEcho(true);
     let modulePath = '/etc/penguins-eggs.d/krill/';
     if (pacman_1.default.packageIsInstalled('calamares')) {
         modulePath = '/etc/calamares/';
@@ -29,7 +29,7 @@ async function packages() {
     let install = [];
     if (fs_1.default.existsSync(config_file)) {
         const packages = js_yaml_1.default.load(fs_1.default.readFileSync(config_file, 'utf-8'));
-        let operations = JSON.parse(JSON.stringify(packages.operations));
+        const operations = JSON.parse(JSON.stringify(packages.operations));
         remove = operations[0].remove;
         if (operations.length > 1) {
             install = operations[1].install;
@@ -37,8 +37,8 @@ async function packages() {
         if (operations !== undefined) {
             if (packages.backend === 'apt') {
                 /**
-                 * apt: Debian/Devuan/Ubuntu
-                 */
+                         * apt: Debian/Devuan/Ubuntu
+                         */
                 if (remove.length > 0) {
                     let cmd = `chroot ${this.installTarget} apt-get purge -y `;
                     for (const elem of remove) {
@@ -57,8 +57,8 @@ async function packages() {
             }
             else if (packages.backend === 'pacman') {
                 /**
-                 * pacman: arch/manjaro
-                 */
+                         * pacman: arch/manjaro
+                         */
                 if (remove.length > 0) {
                     let cmd = `chroot ${this.installTarget} pacman -R\n`;
                     for (const elem of remove) {