penguins-eggs 9.0.2 → 9.0.9

package/lib/classes/krill_prepare.js

@@ -36,11 +36,15 @@ const get_domain_1 = (0, tslib_1.__importDefault)(require("../lib/get_domain"));
 const get_dns_1 = (0, tslib_1.__importDefault)(require("../lib/get_dns"));
 const krill_install_1 = (0, tslib_1.__importDefault)(require("./krill_install"));
 class Krill {
-    async prepare() {
+    /**
+     *
+     * @param cryped
+     */
+    async prepare(cryped = false) {
         const oWelcome = await this.welcome();
         const oLocation = await this.location(oWelcome.language);
         const oKeyboard = await this.keyboard();
-        const oPartitions = await this.partitions();
+        const oPartitions = await this.partitions(cryped);
         const oUsers = await this.users();
         const oNetwork = await this.network();
         await this.summary(oLocation, oKeyboard, oPartitions);
@@ -128,39 +132,47 @@ class Krill {
     /**
     * PARTITIONS
     */
-    async partitions() {
+    async partitions(crypted = false) {
         let installationDevice = '/dev/sda';
         let installationMode = 'standard';
+        let luksPassphrase = 'evolution';
         let filesystemType = 'ext4';
         let userSwapChoice = 'small';
+        if (crypted = true) {
+            installationMode = 'full-encrypted';
+        }
         let partitionsElem;
         while (true) {
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             if (await confirm(partitionsElem, "Confirm Partitions datas?")) {
                 break;
             }
             else {
                 installationDevice = '';
-                installationMode = '';
+                if (crypted = true) {
+                    installationMode = 'full-encrypted';
+                }
+                luksPassphrase = 'evolution';
                 filesystemType = '';
                 userSwapChoice = '';
             }
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             installationDevice = await (0, select_installation_device_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             installationMode = await (0, select_installation_mode_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             filesystemType = await (0, select_filesystem_type_1.default)();
-            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
+            partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
             redraw(partitionsElem);
             userSwapChoice = await (0, select_user_swap_choice_1.default)();
         }
         return {
             installationDevice: installationDevice,
             installationMode: installationMode,
+            luksPassphrase: luksPassphrase,
             filesystemType: filesystemType,
             userSwapChoice: userSwapChoice
         };

package/lib/classes/ovary.js

@@ -547,7 +547,7 @@ class Ovary {
          * isolinux.cfg from isolinux.template.cfg
          */
         const isolinuxDest = this.settings.work_dir.pathIso + 'isolinux/isolinux.cfg';
-        let isolinuxTemplate = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.template.cfg`);
+        let isolinuxTemplate = node_path_1.default.resolve(__dirname, `../../addons/templates/isolinux.template`);
         if (!fs.existsSync(isolinuxTemplate)) {
             utils_2.default.warning('Cannot find: ' + isolinuxTemplate);
             process.exit();
@@ -560,7 +560,7 @@ class Ovary {
         const template = fs.readFileSync(isolinuxTemplate, 'utf8');
         const view = {
             fullname: this.settings.remix.fullname.toUpperCase(),
-            kernel: utils_2.default.kernerlVersion(),
+            kernel: utils_2.default.kernelVersion(),
             vmlinuz: `/live${this.settings.vmlinuz}`,
             initrdImg: `/live${this.settings.initrdImg}`,
             kernel_parameters: kernel_parameters,
@@ -1008,6 +1008,16 @@ class Ovary {
         if (this.familyId === 'debian') {
             // add user live to sudo
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, verbose));
+            // educaandos
+            if (this.theme === 'educaandos') {
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG adm ${this.settings.config.user_opt}`, verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG cdrom ${this.settings.config.user_opt}`, verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG dip ${this.settings.config.user_opt}`, verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG plugdev ${this.settings.config.user_opt}`, verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG lpadmin ${this.settings.config.user_opt}`, verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sambashare ${this.settings.config.user_opt}`, verbose));
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG admin ${this.settings.config.user_opt}`, verbose));
+            }
         }
         else if (this.familyId === 'archlinux') {
             // adduser live to wheel and autologin
@@ -1034,7 +1044,6 @@ class Ovary {
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/krill.svg'), '/usr/share/icons/');
         /**
          * creazione dei link in /usr/share/applications
-         *
          */
         shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/penguins-eggs.desktop'), '/usr/share/applications/');
         let installerUrl = 'install-debian.desktop';
@@ -1047,14 +1056,18 @@ class Ovary {
             installerIcon = 'utilities-terminal';
             shelljs_1.default.cp(node_path_1.default.resolve(__dirname, '../../assets/penguins-krill.desktop'), `${this.settings.work_dir.merged}/usr/share/applications/`);
         }
-        // flags
+        /**
+         * flags
+         */
+        // adapt
         if (myAddons.adapt) {
             // if (Pacman.packageIsInstalled('lxde-core') || Pacman.packageIsInstalled('deepin-desktop-base') || Pacman.packageIsInstalled('mate-desktop') || Pacman.packageIsInstalled('ubuntu-mate-core') || Pacman.packageIsInstalled('xfce4')) {
             const dirAddon = node_path_1.default.resolve(__dirname, `../../addons/eggs/adapt/`);
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-adapt.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
-            shelljs_1.default.cp(`${dirAddon}/bin/eggs-adapt.sh`, `${this.settings.work_dir.merged}/usr/local/bin/`);
+            // shx.cp(`${dirAddon}/bin/eggs-adapt.sh`, `${this.settings.work_dir.merged}/usr/local/bin/`)
             // }
         }
+        // ichoice
         if (myAddons.ichoice) {
             installerUrl = 'eggs-ichoice.desktop';
             installerIcon = 'system-software-install';
@@ -1062,6 +1075,7 @@ class Ovary {
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-ichoice.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
             shelljs_1.default.cp(`${dirAddon}/bin/eggs-ichoice.sh`, `${this.settings.work_dir.merged}/usr/local/bin/`);
         }
+        // pve
         if (myAddons.pve) {
             // Imposto service pve-lite
             const pve = new pve_live_1.default();
@@ -1070,6 +1084,7 @@ class Ovary {
             shelljs_1.default.cp(`${dirAddon}/artwork/eggs-pve.png`, `${this.settings.work_dir.merged}/usr/share/icons/`);
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-pve.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
         }
+        // rsupport
         if (myAddons.rsupport) {
             const dirAddon = node_path_1.default.resolve(__dirname, '../../addons/eggs/rsupport');
             shelljs_1.default.cp(`${dirAddon}/applications/eggs-rsupport.desktop`, `${this.settings.work_dir.merged}/usr/share/applications/`);
@@ -1111,6 +1126,23 @@ class Ovary {
                 if (myAddons.rsupport)
                     text += 'cp /usr/share/applications/eggs-rsupport.desktop $DESKTOP\n';
             }
+            // enable desktop links in gnome
+            /**
+             * test -f /usr/share/applications/penguins-eggs.desktop && cp /usr/share/applications/penguins-eggs.desktop $DESKTOP
+             * test -f "$DESKTOP/penguins-eggs.desktop" && chmod a+x "$DESKTOP/penguins-eggs.desktop"
+             * test -f "$DESKTOP/penguins-eggs.desktop" && gio set "$DESKTOP/penguins-eggs.desktop" metadata::trusted true
+             * test -f /usr/share/applications/install-debian.desktop && cp /usr/share/applications/install-debian.desktop $DESKTOP
+             * test -f "$DESKTOP/install-debian.desktop" && chmod a+x $DESKTOP/install-debian.desktop
+             * test -f "$DESKTOP/install-debian.desktop" && gio set "$DESKTOP/install-debian.desktop" metadata::trusted true
+             */
+            if (pacman_1.default.packageIsInstalled('gdm3') || pacman_1.default.packageIsInstalled('gdm')) {
+                text += `test -f /usr/share/applications/penguins-eggs.desktop && cp /usr/share/applications/penguins-eggs.desktop $DESKTOP\n`;
+                text += `test -f "$DESKTOP/penguins-eggs.desktop" && chmod a+x "$DESKTOP/penguins-eggs.desktop"\n`;
+                text += `test -f "$DESKTOP/penguins-eggs.desktop" && gio set "$DESKTOP/penguins-eggs.desktop" metadata::trusted true\n`;
+                text += `test -f /usr/share/applications/install-debian.desktop && cp /usr/share/applications/install-debian.desktop $DESKTOP\n`;
+                text += `test -f "$DESKTOP/install-debian.desktop" && chmod a+x $DESKTOP/install-debian.desktop\n`;
+                text += `test -f "$DESKTOP/install-debian.desktop" && gio set "$DESKTOP/install-debian.desktop" metadata::trusted true\n`;
+            }
             fs.writeFileSync(script, text, 'utf8');
             await (0, utils_1.exec)(`chmod a+x ${script}`, echo);
         }
@@ -1189,7 +1221,7 @@ class Ovary {
         let text = '';
         text += 'search --file --set=root /.disk/info\n';
         text += 'set prefix=($root)/boot/grub\n';
-        text += `source $prefix/x86_64-efi/grub.cfg\n`;
+        text += `source $prefix/${utils_2.default.machineUEFI()}/grub.cfg\n`;
         utils_2.default.write(grubCfg, text);
         // #################################
         /**
@@ -1219,7 +1251,7 @@ class Ovary {
          * copy theme
          */
         const themeDest = `${efiWorkDir}/boot/grub/theme.cfg`;
-        const themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.theme.cfg`);
+        const themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
         if (!fs.existsSync(themeSrc)) {
             utils_2.default.warning('Cannot find: ' + themeSrc);
             process.exit();
@@ -1285,7 +1317,7 @@ class Ovary {
         // Do the main grub.cfg (which gets loaded last):
         // grub.theme.cfg
         const grubThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
-        const grubThemeDest = `${isoDir}/boot/grub/grub.theme.cfg`;
+        const grubThemeDest = `${isoDir}/boot/grub/theme.cfg`;
         if (!fs.existsSync(grubThemeSrc)) {
             utils_2.default.warning('Cannot find: ' + grubThemeSrc);
             process.exit();
@@ -1294,23 +1326,24 @@ class Ovary {
         /**
         * prepare grub.cfg from grub.template.cfg
         */
-        const grubTemplate = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.template.cfg`);
+        const grubTemplate = node_path_1.default.resolve(__dirname, `../../addons/templates/grub.template`);
         if (!fs.existsSync(grubTemplate)) {
             utils_2.default.warning('Cannot find: ' + grubTemplate);
             process.exit();
         }
+        let kernel_parameters = `boot=live locales=${process.env.LANG}`;
+        let volid = utils_2.default.getVolid(this.settings.remix.name);
+        if (this.familyId === "archlinux") {
+            kernel_parameters = `misobasedir=live misolabel=${volid} boot=live locales=${process.env.LANG}`;
+        }
         const grubDest = `${isoDir}/boot/grub/grub.cfg`;
         const template = fs.readFileSync(grubTemplate, 'utf8');
         const view = {
             fullname: this.settings.remix.fullname.toUpperCase(),
-            kernel: utils_2.default.kernerlVersion(),
+            kernel: utils_2.default.kernelVersion(),
             vmlinuz: `/live${this.settings.vmlinuz}`,
             initrdImg: `/live${this.settings.initrdImg}`,
-            usernameOpt: this.settings.config.user_opt,
-            netconfigOpt: this.settings.config.netconfig_opt,
-            timezoneOpt: this.settings.config.timezone,
-            lang: process.env.LANG,
-            locales: process.env.LANG
+            kernel_parameters: kernel_parameters,
         };
         fs.writeFileSync(grubDest, mustache_1.default.render(template, view));
         /**
@@ -1332,7 +1365,7 @@ class Ovary {
         shelljs_1.default.mkdir('-p', dotDisk);
         // .disk/info
         let file = dotDisk + '/info';
-        let content = utils_2.default.getVolid(this.settings.remix.name); //this.settings.config.snapshot_prefix + this.settings.config.snapshot_basename
+        let content = utils_2.default.getVolid(this.settings.remix.name);
         fs.writeFileSync(file, content, 'utf-8');
         // .disk/mksquashfs
         const scripts = this.settings.work_dir.path;

package/lib/classes/pacman.js

@@ -409,7 +409,12 @@ class Pacman {
     static async autocompleteInstall(verbose = false) {
         if (this.distro().familyId === 'debian') {
             if (Pacman.packageIsInstalled('bash-completion')) {
-                await (0, utils_2.exec)(`cp ${__dirname}/../../scripts/eggs.bash /etc/bash_completion.d/`);
+                if (node_fs_1.default.existsSync('/usr/share/bash-completion/completions/')) {
+                    await (0, utils_2.exec)(`cp ${__dirname}/../../scripts/eggs.bash /usr/share/bash-completion/completions/`);
+                }
+                else if (node_fs_1.default.existsSync('/etc/bash_completion.d/')) {
+                    await (0, utils_2.exec)(`cp ${__dirname}/../../scripts/eggs.bash /etc/bash_completion.d/`);
+                }
             }
         }
         else if (this.distro().familyId === 'archlinux') {
@@ -422,13 +427,14 @@ class Pacman {
      * Installa manPage
      */
     static async manPageInstall(verbose = false) {
-        const manPage = node_path_1.default.resolve(__dirname, '../../manpages/doc/man/eggs.1.gz');
-        if (node_fs_1.default.existsSync(manPage)) {
+        const manPageSrc = node_path_1.default.resolve(__dirname, '../../manpages/doc/man/eggs.roll.gz');
+        if (node_fs_1.default.existsSync(manPageSrc)) {
             const man1Dir = '/usr/share/man/man1/';
             if (!node_fs_1.default.existsSync(man1Dir)) {
                 (0, utils_2.exec)(`mkdir ${man1Dir} -p`);
             }
-            (0, utils_2.exec)(`cp ${manPage} ${man1Dir}`);
+            const manPageDest = man1Dir + 'eggs.1.gz';
+            (0, utils_2.exec)(`cp ${manPageSrc} ${manPageDest}`);
             if (shelljs_1.default.exec('which mandb', { silent: true }).stdout.trim() !== '') {
                 await (0, utils_2.exec)('mandb > /dev/null');
                 if (verbose) {

package/lib/classes/settings.js

@@ -212,7 +212,7 @@ class Settings {
      */
     async loadRemix(basename = '', theme = '') {
         this.remix.versionNumber = utils_1.default.getPackageVersion();
-        this.remix.kernel = utils_1.default.kernerlVersion();
+        this.remix.kernel = utils_1.default.kernelVersion();
         this.remix.branding = theme === '' ? 'eggs' : theme;
         this.remix.name = this.config.snapshot_basename;
         let name = this.config.snapshot_prefix + this.config.snapshot_basename;

package/lib/classes/utils.d.ts

@@ -178,7 +178,7 @@ export default class Utils {
     /**
      * get the kernel version
      */
-    static kernerlVersion(): string;
+    static kernelVersion(): string;
     /**
      * return the name of network device
      */

package/lib/classes/utils.js

@@ -481,7 +481,7 @@ class Utils {
     /**
      * get the kernel version
      */
-    static kernerlVersion() {
+    static kernelVersion() {
         return os_1.default.release();
     }
     /**

package/lib/classes/xdg.js

@@ -84,7 +84,14 @@ class Xdg {
             }
             // lightdm
             if (pacman_1.default.packageIsInstalled('lightdm')) {
-                shelljs_1.default.sed('-i', `autologin-user=${olduser}`, `autologin-user=${newuser}`, `${chroot}/etc/lightdm/lightdm.conf`);
+                if (node_fs_1.default.existsSync(`${chroot}/etc/lightdm/lightdm.conf`)) {
+                    shelljs_1.default.sed('-i', `autologin-user=${olduser}`, `autologin-user=${newuser}`, `${chroot}/etc/lightdm/lightdm.conf`);
+                }
+                else {
+                    const autologin = `${chroot}/etc/lightdm/lightdm.conf`;
+                    const content = `[Seat:*]\nautologin-user=${newuser}`;
+                    node_fs_1.default.writeFileSync(autologin, content, 'utf-8');
+                }
             }
             // sddm
             if (pacman_1.default.packageIsInstalled('sddm')) {
@@ -111,10 +118,20 @@ class Xdg {
                     }
                 }
             }
-            // gdm3
+            // gdm3 in ubuntu, gdm in manjaro
             if (pacman_1.default.packageIsInstalled('gdm3')) {
-                shelljs_1.default.sed('-i', 'AutomaticLoginEnable=False', 'AutomaticLoginEnable=True', `${chroot}/etc/gdm3/custom.conf`);
-                shelljs_1.default.sed('-i', `AutomaticLogin=${olduser}`, `AutomaticLogin=${newuser}`, `${chroot}/etc/gdm3/custom.conf`);
+                const gdm3Custom = `${chroot}/etc/gdm3/custom.conf`;
+                if (node_fs_1.default.existsSync(gdm3Custom)) {
+                    shelljs_1.default.sed('-i', 'AutomaticLoginEnable=False', 'AutomaticLoginEnable=True', gdm3Custom);
+                    shelljs_1.default.sed('-i', `AutomaticLogin=${olduser}`, `AutomaticLogin=${newuser}`, gdm3Custom);
+                }
+            }
+            else if (pacman_1.default.packageIsInstalled('gdm')) {
+                const gdmCustom = `${chroot}/etc/gdm/custom.conf`;
+                if (node_fs_1.default.existsSync(gdmCustom)) {
+                    shelljs_1.default.sed('-i', 'AutomaticLoginEnable=False', 'AutomaticLoginEnable=True', gdmCustom);
+                    shelljs_1.default.sed('-i', `AutomaticLogin=${olduser}`, `AutomaticLogin=${newuser}`, gdmCustom);
+                }
             }
         }
     }

package/lib/classes/yolk.js

@@ -28,7 +28,7 @@ class Yolk {
         /**
          * riga apt
          *
-         * deb [trusted=yes] file:/usr/local/yolk ./
+         * deb [trusted=yes] file:/var/local/yolk ./
          *
          */
         utils_1.default.warning('updating system...');
@@ -114,7 +114,7 @@ class Yolk {
                 }
             }
         }
-        // e li vado a scaricare in /usr/local/yolk
+        // e li vado a scaricare in /var/local/yolk
         for (const toDownload of toDownloads) {
             process.chdir(this.dir);
             const cmd = `apt-get download ${toDownload}`;

package/lib/commands/install.d.ts

@@ -11,6 +11,7 @@ import { Command } from '@oclif/core';
 export default class Install extends Command {
     static flags: {
         cli: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        crypted: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };

package/lib/commands/install.js

@@ -23,6 +23,10 @@ class Install extends core_1.Command {
     async run() {
         utils_1.default.titles(this.id + ' ' + this.argv);
         const { flags } = await this.parse(Install);
+        let crypted = false;
+        if (flags.crypted) {
+            crypted = true;
+        }
         let verbose = false;
         if (flags.verbose) {
             verbose = true;
@@ -38,7 +42,7 @@ class Install extends core_1.Command {
                 }
                 else {
                     const krill = new krill_prepare_1.default();
-                    await krill.prepare();
+                    await krill.prepare(crypted);
                 }
             }
         }
@@ -50,6 +54,7 @@ class Install extends core_1.Command {
 exports.default = Install;
 Install.flags = {
     cli: core_1.Flags.boolean({ char: 'c', description: 'force use CLI installer' }),
+    crypted: core_1.Flags.boolean({ char: 'k', description: 'crypted CLI installation' }),
     help: core_1.Flags.help({ char: 'h' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' })
 };

package/lib/commands/produce.js

@@ -73,7 +73,9 @@ class Produce extends core_1.Command {
             else if (compressors.isEnabled.lz4) {
                 fastest = 'lz4';
             }
-            // jessie e stretch usano solo normal
+            /**
+             * jessie e stretch will use gzip for fastest
+            */
             const settings = new settings_1.default();
             if (settings.distro.versionLike === 'jessie' || settings.distro.versionLike === 'stretch') {
                 fastest = 'gzip';
@@ -96,6 +98,9 @@ class Produce extends core_1.Command {
             if (release) {
                 compression = 'xz -Xbcj x86';
             }
+            /**
+             * theme: if not defined will use eggs
+             */
             let theme = 'eggs';
             if (flags.theme !== undefined) {
                 theme = flags.theme;

package/lib/commands/tools/yolk.js

@@ -42,4 +42,4 @@ DevYolk.flags = {
     help: core_1.Flags.help({ char: 'h' }),
     verbose: core_1.Flags.boolean({ char: 'v' })
 };
-DevYolk.dir = '/usr/local/yolk';
+DevYolk.dir = '/var/local/yolk';

package/lib/components/partitions.d.ts

@@ -2,8 +2,9 @@
 declare type partitionsProps = {
     installationDevice?: string;
     installationMode?: string;
+    luksPassphrase: string;
     filesystemType?: string;
     userSwapChoice?: string;
 };
-export default function Partitions({ installationDevice, installationMode, filesystemType, userSwapChoice }: partitionsProps): JSX.Element;
+export default function Partitions({ installationDevice, installationMode, luksPassphrase, filesystemType, userSwapChoice }: partitionsProps): JSX.Element;
 export {};

package/lib/components/partitions.js

@@ -10,7 +10,7 @@ const title_1 = (0, tslib_1.__importDefault)(require("./elements/title"));
 const steps_1 = (0, tslib_1.__importDefault)(require("./elements/steps"));
 const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-function Partitions({ installationDevice, installationMode, filesystemType, userSwapChoice }) {
+function Partitions({ installationDevice, installationMode, luksPassphrase, filesystemType, userSwapChoice }) {
     let installer = 'krill';
     let productName = 'unknown';
     let version = 'x.x.x';
@@ -57,13 +57,15 @@ function Partitions({ installationDevice, installationMode, filesystemType, user
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "BIOS: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, bios)),
-                        react_1.default.createElement(ink_1.Newline, null),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Installation device: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, installationDevice)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Installation mode: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, installationMode)),
+                        react_1.default.createElement(ink_1.Box, null,
+                            react_1.default.createElement(ink_1.Text, null, "LUKS passphrase: "),
+                            react_1.default.createElement(ink_1.Text, { color: "cyan" }, luksPassphrase)),
                         react_1.default.createElement(ink_1.Box, null,
                             react_1.default.createElement(ink_1.Text, null, "Filesystem: "),
                             react_1.default.createElement(ink_1.Text, { color: "cyan" }, filesystemType)),

package/lib/interfaces/i-krill.d.ts

@@ -14,6 +14,7 @@ export interface IKeyboard {
 export interface IPartitions {
     installationDevice: string;
     installationMode: string;
+    luksPassphrase: string;
     filesystemType: string;
     userSwapChoice: string;
 }

package/lib/lib/get_password.js

@@ -1,5 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+//import { option } from '@oclif/command/lib/flags'
 const inquirer = require("inquirer");
 async function getPassword(initial) {
     const requireLetterAndNumber = (value) => {