penguins-eggs 9.3.26 → 9.3.28

package/dist/krill/modules/locale.js

@@ -7,22 +7,24 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
+const utils_js_1 = __importDefault(require("../../classes/utils.js"));
 /**
     * locale
    */
 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`;
@@ -37,16 +39,16 @@ async function locale() {
     content += `LC_MEASUREMENT=${defaultLocale}\n`;
     content += `LC_IDENTIFICATION=${defaultLocale}\n`;
     content += `LC_ALL=${defaultLocale}\n`;
-    utils_1.default.write(file, content);
+    utils_js_1.default.write(file, content);
     // /etc/locale.conf
     file = this.installTarget + '/etc/locale.conf';
-    utils_1.default.write(file, content);
+    utils_js_1.default.write(file, content);
     // timezone
     try {
         await this.timezone();
     }
     catch (error) {
-        await utils_1.default.pressKeyToExit(JSON.stringify(error));
+        await utils_js_1.default.pressKeyToExit(JSON.stringify(error));
     }
 }
 exports.default = locale;

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

@@ -7,44 +7,46 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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");
-const fs_1 = tslib_1.__importDefault(require("fs"));
+const utils_js_1 = __importDefault(require("../../classes/utils.js"));
+const utils_js_2 = require("../../lib/utils.js");
+const fs_1 = __importDefault(require("fs"));
 /**
  *
  * @param this
  */
 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()) {
+    if (!utils_js_1.default.isSystemd()) {
         cmd = `chroot ${this.installTarget} setupcon ${this.toNull}`;
     }
     try {
-        await (0, utils_2.exec)(cmd, this.echo);
+        await (0, utils_js_2.exec)(cmd, this.echo);
     }
     catch (error) {
         console.log(error);
-        utils_1.default.pressKeyToExit(cmd, true);
+        utils_js_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
-    */
-    if (utils_1.default.isSystemd()) {
+       * 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_js_1.default.isSystemd()) {
         let content = '# KEYBOARD CONFIGURATION FILE\n\n';
         content += '# Consult the keyboard(5) manual page.\n\n';
         content += '# See penguins-eggs/src/krill/modules/m-keyboard.ts\n\n';
@@ -54,23 +56,23 @@ async function mKeyboard() {
         content += 'XKBOPTIONS=""\n';
         content += '\n';
         content += 'BACKSPACE="guess"\n';
-        utils_1.default.write(this.installTarget + '/etc/default/keyboard', content);
+        utils_js_1.default.write(this.installTarget + '/etc/default/keyboard', content);
         content = '# See penguins-eggs/src/krill/modules/set-keyboard.ts\n\n';
         content += 'KEYMAP="' + this.keyboardLayout + '"\n';
         content += 'FONT=\n';
         content += 'FONT_MAP=\n';
-        utils_1.default.write(this.installTarget + '/etc/vconsole.conf', content);
+        utils_js_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);
+            utils_js_1.default.write(this.installTarget + '/etc/X11/xorg.conf.d/00-keyboard.conf', content);
         }
     }
 }

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

@@ -7,10 +7,12 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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"));
+const utils_js_1 = require("../../lib/utils.js");
+const fs_1 = __importDefault(require("fs"));
 /**
  *
  * @param this
@@ -18,9 +20,9 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 async function mTimezone() {
     if (fs_1.default.existsSync('/etc/localtime')) {
         const cmd = `chroot ${this.installTarget} unlink /etc/localtime`;
-        await (0, utils_1.exec)(cmd, this.echo);
+        await (0, utils_js_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);
+    await (0, utils_js_1.exec)(cmd, this.echo);
 }
 exports.default = mTimezone;

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

@@ -7,20 +7,22 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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"));
+const utils_js_1 = require("../../lib/utils.js");
+const fs_1 = __importDefault(require("fs"));
 /**
  * On Ubuntu
  * /etc/machine-id must exist to be re-created
  * 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);
+        await (0, utils_js_1.exec)(`rm ${file}`, this.echo);
     }
-    await (0, utils_1.exec)(`touch ${file}`);
+    await (0, utils_js_1.exec)(`touch ${file}`);
 }
 exports.default = machineId;

package/dist/krill/modules/mkfs.js

@@ -8,30 +8,30 @@
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../lib/utils");
+const utils_js_1 = require("../../lib/utils.js");
 /**
 * mkfs
 */
 async function mkfs() {
     const result = true;
     if (this.efi) {
-        await (0, utils_1.exec)(`mkdosfs -F 32 -I ${this.devices.efi.name} ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mkdosfs -F 32 -I ${this.devices.efi.name} ${this.toNull}`, this.echo);
     }
     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);
+        await (0, utils_js_1.exec)(`mke2fs -Ft ${this.devices.boot.fsType} ${this.devices.boot.name} ${this.toNull}`, this.echo);
     }
     if (this.devices.root.name !== 'none') {
-        await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.root.fsType} ${this.devices.root.name} ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mke2fs -Ft ${this.devices.root.fsType} ${this.devices.root.name} ${this.toNull}`, this.echo);
     }
     if (this.devices.data.name !== 'none') {
-        await (0, utils_1.exec)(`mke2fs -Ft ${this.devices.data.fsType} ${this.devices.data.name} ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mke2fs -Ft ${this.devices.data.fsType} ${this.devices.data.name} ${this.toNull}`, this.echo);
     }
     if (this.devices.swap.name !== 'none') {
-        await (0, utils_1.exec)(`mkswap ${this.devices.swap.name} ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mkswap ${this.devices.swap.name} ${this.toNull}`, this.echo);
     }
     return result;
 }

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

@@ -7,40 +7,40 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.umountFs = exports.mountFs = void 0;
-const tslib_1 = require("tslib");
-const utils_1 = require("../../lib/utils");
-const fs_1 = tslib_1.__importDefault(require("fs"));
+const utils_js_1 = require("../../lib/utils.js");
+const fs_1 = __importDefault(require("fs"));
 /**
    * mountFs
    */
 async function mountFs() {
     if (!fs_1.default.existsSync(this.installTarget)) {
-        await (0, utils_1.exec)(`mkdir ${this.installTarget} ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mkdir ${this.installTarget} ${this.toNull}`, this.echo);
     }
     // root
-    await (0, utils_1.exec)(`mount ${this.devices.root.name} ${this.installTarget}${this.devices.root.mountPoint} ${this.toNull}`, this.echo);
-    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);
+    await (0, utils_js_1.exec)(`mount ${this.devices.root.name} ${this.installTarget}${this.devices.root.mountPoint} ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`tune2fs -c 0 -i 0 ${this.devices.root.name} ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`rm -rf ${this.installTarget}/lost+found ${this.toNull}`, this.echo);
     // boot
-    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);
+    if (this.devices.boot.name !== 'none') {
+        await (0, utils_js_1.exec)(`mkdir ${this.installTarget}/boot -p ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mount ${this.devices.boot.name} ${this.installTarget}${this.devices.boot.mountPoint} ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`tune2fs -c 0 -i 0 ${this.devices.boot.name} ${this.toNull}`, this.echo);
     }
     // data
-    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);
+    if (this.devices.data.name !== 'none') {
+        await (0, utils_js_1.exec)(`mkdir ${this.installTarget}${this.devices.data.mountPoint} -p ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mount ${this.devices.data.name} ${this.installTarget}${this.devices.data.mountPoint} ${this.toNull}`, this.echo);
+        await (0, utils_js_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_js_1.exec)(`mkdir ${this.installTarget}${this.devices.efi.mountPoint} -p ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mount ${this.devices.efi.name} ${this.installTarget}${this.devices.efi.mountPoint} ${this.toNull}`, this.echo);
     }
     return true;
 }
@@ -54,11 +54,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/mount-vfs.js

@@ -9,24 +9,24 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.umountVfs = exports.mountVfs = void 0;
-const utils_1 = require("../../lib/utils");
+const utils_js_1 = require("../../lib/utils.js");
 /**
 * mountvfs()
 */
 async function mountVfs() {
-    await (0, utils_1.exec)(`mkdir ${this.installTarget}/dev ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mkdir ${this.installTarget}/dev/pts ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mkdir ${this.installTarget}/proc ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mkdir ${this.installTarget}/sys ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mkdir ${this.installTarget}/run ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mount -o bind /dev ${this.installTarget}/dev ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mount -o bind /dev/pts ${this.installTarget}/dev/pts ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mount -o bind /proc ${this.installTarget}/proc ${this.toNull}`, this.echo);
-    await (0, utils_1.exec)(`mount -o bind /sys ${this.installTarget}/sys ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mkdir ${this.installTarget}/dev ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mkdir ${this.installTarget}/dev/pts ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mkdir ${this.installTarget}/proc ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mkdir ${this.installTarget}/sys ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mkdir ${this.installTarget}/run ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mount -o bind /dev ${this.installTarget}/dev ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mount -o bind /dev/pts ${this.installTarget}/dev/pts ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mount -o bind /proc ${this.installTarget}/proc ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mount -o bind /sys ${this.installTarget}/sys ${this.toNull}`, this.echo);
     if (this.efi) {
-        await (0, utils_1.exec)(`mount -o bind /sys/firmware/efi/efivars ${this.installTarget}/sys/firmware/efi/efivars ${this.toNull}`, this.echo);
+        await (0, utils_js_1.exec)(`mount -o bind /sys/firmware/efi/efivars ${this.installTarget}/sys/firmware/efi/efivars ${this.toNull}`, this.echo);
     }
-    await (0, utils_1.exec)(`mount -o rbind /run ${this.installTarget}/run ${this.toNull}`, this.echo);
+    await (0, utils_js_1.exec)(`mount -o rbind /run ${this.installTarget}/run ${this.toNull}`, this.echo);
 }
 exports.mountVfs = mountVfs;
 /**

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

@@ -7,10 +7,12 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const utils_1 = tslib_1.__importDefault(require("../../classes/utils"));
-const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
+const utils_js_1 = __importDefault(require("../../classes/utils.js"));
+const pacman_js_1 = __importDefault(require("../../classes/pacman.js"));
 /**
 /**
  * networkcfg
@@ -21,26 +23,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_js_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_js_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';
@@ -48,7 +48,7 @@ async function networkCfg() {
         for (const element of this.network.dns) {
             content += 'nameserver ' + element + '\n';
         }
-        utils_1.default.write(file, content);
+        utils_js_1.default.write(file, content);
     }
 }
 exports.default = networkCfg;

package/dist/krill/modules/packages.js

@@ -7,21 +7,23 @@
  *
  * https://stackoverflow.com/questions/23876782/how-do-i-split-a-typescript-class-into-multiple-files
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const utils_1 = require("../../lib/utils");
-const utils_2 = tslib_1.__importDefault(require("../../classes/utils"));
-const pacman_1 = tslib_1.__importDefault(require("../../classes/pacman"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const utils_js_1 = require("../../lib/utils.js");
+const utils_js_2 = __importDefault(require("../../classes/utils.js"));
+const pacman_js_1 = __importDefault(require("../../classes/pacman.js"));
+const fs_1 = __importDefault(require("fs"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
 /**
  *
  * @param this
  */
 async function packages() {
-    let echoYes = utils_2.default.setEcho(true);
+    const echoYes = utils_js_2.default.setEcho(true);
     let modulePath = '/etc/penguins-eggs.d/krill/';
-    if (pacman_1.default.packageIsInstalled('calamares')) {
+    if (pacman_js_1.default.packageIsInstalled('calamares')) {
         modulePath = '/etc/calamares/';
     }
     const config_file = `${this.installTarget}${modulePath}modules/packages.conf`;
@@ -29,7 +31,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,38 +39,38 @@ 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) {
                         cmd += elem + ' ';
                     }
-                    await (0, utils_1.exec)(`${cmd} ${this.toNull}`, this.echo);
+                    await (0, utils_js_1.exec)(`${cmd} ${this.toNull}`, this.echo);
                 }
                 if (install.length > 0) {
                     let cmd = `chroot ${this.installTarget} apt-get install -y `;
                     for (const elem of install) {
                         cmd += elem + ' ';
                     }
-                    await (0, utils_1.exec)(`chroot ${this.installTarget} apt-get update ${this.toNull}`, this.echo);
-                    await (0, utils_1.exec)(`${cmd} ${this.toNull}`, this.echo);
+                    await (0, utils_js_1.exec)(`chroot ${this.installTarget} apt-get update ${this.toNull}`, this.echo);
+                    await (0, utils_js_1.exec)(`${cmd} ${this.toNull}`, this.echo);
                 }
             }
             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) {
                         cmd += elem + ' ';
                     }
-                    await (0, utils_1.exec)(`${cmd} ${echoYes}`, this.echo);
+                    await (0, utils_js_1.exec)(`${cmd} ${echoYes}`, this.echo);
                 }
                 if (install.length > 0) {
                     for (const elem of install) {
-                        await (0, utils_1.exec)(`chroot ${this.installTarget} pacman -S ${elem}`, echoYes);
+                        await (0, utils_js_1.exec)(`chroot ${this.installTarget} pacman -S ${elem}`, echoYes);
                     }
                 }
             }