penguins-eggs 9.3.7 → 9.3.9

package/dist/classes/incubation/incubator.js

@@ -28,16 +28,18 @@ class Incubator {
      * @param distro
      * @param verbose
      */
-    constructor(remix, distro, user_opt = 'live', verbose = false) {
+    constructor(remix, distro, user_opt = 'live', theme = 'eggs', verbose = false) {
         this.verbose = false;
         this.installer = {};
         this.installer = (0, installer_1.installer)();
         this.remix = remix;
         this.distro = distro;
         this.user_opt = user_opt;
+        this.theme = theme;
         this.verbose = verbose;
-        if (remix.branding === undefined) {
-            remix.branding = 'eggs';
+        this.remix.branding = theme;
+        if (theme.includes('/')) {
+            this.remix.branding = theme.substring(theme.lastIndexOf('/') + 1);
         }
     }
     /**
@@ -60,17 +62,17 @@ class Incubator {
                 break;
             }
             case 'buster': {
-                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const buster = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await buster.create();
                 break;
             }
             case 'bullseye': {
-                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const bullseye = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await bullseye.create();
                 break;
             }
             case 'bookworm': {
-                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const bookworm = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await bookworm.create();
                 // DEVUAN
                 break;
@@ -79,17 +81,17 @@ class Incubator {
              * DEVUAN
              */
             case 'beowulf': {
-                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const beowulf = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await beowulf.create();
                 break;
             }
             case 'chimaera': {
-                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const chimaera = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await chimaera.create();
                 break;
             }
             case 'daedalus': {
-                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const daedalus = new buster_1.Buster(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await daedalus.create();
                 break;
             }
@@ -102,17 +104,17 @@ class Incubator {
                 break;
             }
             case 'focal': {
-                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const focal = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await focal.create();
                 break;
             }
             case 'jammy': {
-                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const jammy = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await jammy.create();
                 break;
             }
             case 'kinetic': {
-                const kinetic = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.verbose);
+                const kinetic = new focal_1.Focal(this.installer, this.remix, this.distro, this.user_opt, release, this.theme, this.verbose);
                 await kinetic.create();
                 break;
             }
@@ -200,7 +202,11 @@ class Incubator {
          * ADDONS (only for calamares)
          */
         if (this.installer.name === 'calamares') {
-            const calamaresBranding = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/calamares/branding`);
+            // console.log('theme: ' + this.theme)
+            let calamaresBranding = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/calamares/branding`);
+            if (this.theme.includes('/')) {
+                calamaresBranding = `${this.theme}/theme/calamares/branding`;
+            }
             if (node_fs_1.default.existsSync(calamaresBranding)) {
                 if (!node_fs_1.default.existsSync(this.installer.configuration + `branding/${this.remix.branding}`)) {
                     try {
@@ -213,23 +219,29 @@ class Incubator {
                 shelljs_1.default.cp(calamaresBranding + '/*', this.installer.configuration + `branding/${this.remix.branding}/`);
             }
             else {
-                console.log(`${calamaresBranding} not found!`);
+                console.log(`${calamaresBranding} branding not found!`);
                 process.exit();
             }
-            const calamaresIcon = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/artwork/install-debian.png`);
+            let calamaresIcon = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/artwork/install-debian.png`);
+            if (this.theme.includes('/')) {
+                calamaresIcon = `${this.theme}/theme/artwork/install-debian.png`;
+            }
             if (node_fs_1.default.existsSync(calamaresIcon)) {
                 shelljs_1.default.cp(calamaresIcon, '/usr/share/icons/');
             }
             else {
-                console.log(`${calamaresIcon} not found!`);
+                console.log(`${calamaresIcon} icon not found!`);
                 process.exit();
             }
-            const calamaresLauncher = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/applications/install-debian.desktop`);
+            let calamaresLauncher = node_path_1.default.resolve(__dirname, `../../../addons/${this.remix.branding}/theme/applications/install-debian.desktop`);
+            if (this.theme.includes('/')) {
+                calamaresLauncher = `${this.theme}/theme/applications/install-debian.desktop`;
+            }
             if (node_fs_1.default.existsSync(calamaresLauncher)) {
                 shelljs_1.default.cp(calamaresLauncher, '/usr/share/applications/');
             }
             else {
-                console.log(`${calamaresLauncher} not found!`);
+                console.log(`${calamaresLauncher} launcher not found!`);
                 process.exit();
             }
             // script di avvio

package/dist/classes/ovary.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 // packages
 const fs_1 = tslib_1.__importDefault(require("fs"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const node_os_1 = tslib_1.__importDefault(require("node:os"));
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
@@ -47,6 +48,7 @@ class Ovary {
         this.snapshot_prefix = '';
         this.snapshot_basename = '';
         this.compression = '';
+        this.theme = '';
         this.clone = false;
     }
     /**
@@ -63,7 +65,7 @@ class Ovary {
                 this.settings.config.snapshot_basename = snapshot_basename;
             }
             if (theme !== '') {
-                this.settings.config.theme = theme;
+                this.theme = theme;
             }
             if (compression !== '') {
                 this.settings.config.compression = compression;
@@ -106,7 +108,7 @@ class Ovary {
         if (!fs_1.default.existsSync(this.settings.config.snapshot_dir)) {
             shelljs_1.default.mkdir('-p', this.settings.config.snapshot_dir);
         }
-        await this.settings.loadRemix(this.snapshot_basename, this.settings.config.theme);
+        await this.settings.loadRemix(this.snapshot_basename, this.theme);
         if (utils_2.default.isLive()) {
             console.log(chalk_1.default.red('>>> eggs: This is a live system! An egg cannot be produced from an egg!'));
         }
@@ -159,10 +161,10 @@ class Ovary {
                  * viene creata la configurazione dell'installer: krill/calamares
                  * L'installer prende il tema da settings.remix.branding
                  */
-                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, verbose);
+                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, this.theme, verbose);
                 await this.incubator.config(release);
                 await this.syslinux();
-                await this.isolinux(this.settings.config.theme);
+                await this.isolinux(this.theme);
                 await this.kernelCopy();
                 /**
                  * we need different behaviour on
@@ -175,7 +177,7 @@ class Ovary {
                     await this.initrdCreate();
                 }
                 if (this.settings.config.make_efi) {
-                    await this.makeEfi(this.settings.config.theme);
+                    await this.makeEfi(this.theme);
                 }
                 await this.bindLiveFs();
                 /**
@@ -221,7 +223,7 @@ class Ovary {
                     await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${this.settings.work_dir.pathIso}manjaro/x86_64/livefs.sfs`, this.echo);
                     await (0, utils_1.exec)(`md5sum ${this.settings.work_dir.pathIso}live/filesystem.squashfs > ${this.settings.work_dir.pathIso}manjaro/x86_64/livefs.md5`, this.echo);
                 }
-                else if (this.settings.distro.distroId === 'Arch') {
+                else if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
                     await (0, utils_1.exec)(`mkdir ${this.settings.work_dir.pathIso}arch/x86_64 -p`, this.echo);
                     await (0, utils_1.exec)(`ln ${this.settings.work_dir.pathIso}live/filesystem.squashfs          ${this.settings.work_dir.pathIso}arch/x86_64/airootfs.sfs`, this.echo);
                     await (0, utils_1.exec)(`sha512sum ${this.settings.work_dir.pathIso}live/filesystem.squashfs > ${this.settings.work_dir.pathIso}arch/x86_64/airootfs.sha512`, this.echo);
@@ -524,7 +526,10 @@ class Ovary {
          * isolinux.theme.cfg
          */
         const isolinuxThemeDest = this.settings.work_dir.pathIso + 'isolinux/isolinux.theme.cfg';
-        const isolinuxThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.theme.cfg`);
+        let isolinuxThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/isolinux.theme.cfg`);
+        if (this.theme.includes('/')) {
+            isolinuxThemeSrc = `${theme}/theme/livecd/isolinux.theme.cfg`;
+        }
         if (!fs_1.default.existsSync(isolinuxThemeSrc)) {
             utils_2.default.warning('Cannot find: ' + isolinuxThemeSrc);
             process.exit();
@@ -548,7 +553,7 @@ class Ovary {
             if (this.settings.distro.distroId === 'ManjaroLinux') {
                 kernel_parameters += ` misobasedir=manjaro misolabel=${volid}`;
             }
-            else if (this.settings.distro.distroId === 'Arch') {
+            else if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
                 kernel_parameters += ` archisobasedir=arch archisolabel=${volid} cow_spacesize=4G`;
             }
         }
@@ -565,7 +570,10 @@ class Ovary {
          * splash
          */
         const splashDest = `${this.settings.work_dir.pathIso}/isolinux/splash.png`;
-        const splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        let splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        if (this.theme.includes('/')) {
+            splashSrc = node_path_1.default.resolve(`${theme}/theme/livecd/splash.png`);
+        }
         if (!fs_1.default.existsSync(splashSrc)) {
             utils_2.default.warning('Cannot find: ' + splashSrc);
             process.exit();
@@ -581,7 +589,6 @@ class Ovary {
         }
         let lackVmlinuzImage = false;
         if (fs_1.default.existsSync(this.settings.kernel_image)) {
-            console.log('kernel image:' + this.settings.kernel_image);
             await (0, utils_1.exec)(`cp ${this.settings.kernel_image} ${this.settings.work_dir.pathIso}/live/`, this.echo);
         }
         else {
@@ -604,7 +611,7 @@ class Ovary {
         if (this.settings.distro.distroId === 'ManjaroLinux') {
             await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/manjaro/mkinitcpio-produce.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
         }
-        else if (this.settings.distro.distroId === 'Arch') {
+        else if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
             await (0, utils_1.exec)(`mkinitcpio -c ${node_path_1.default.resolve(__dirname, '../../mkinitcpio/archlinux/mkinitcpio-produce.conf')} -g ${this.settings.work_dir.pathIso}/live/${initrdImg}`, utils_2.default.setEcho(true));
         }
     }
@@ -775,7 +782,7 @@ class Ovary {
         let cmd = '';
         const cmds = [];
         cmds.push('# NOTE: cdrom, dev, live, media, mnt, proc, run, sys and tmp', `#       need just a mkdir in ${this.settings.work_dir.merged}`);
-        cmds.push(`# host: ${node_os_1.default.hostname()} user: ${utils_2.default.getPrimaryUser()}\n`);
+        cmds.push(`# host: ${node_os_1.default.hostname()} user: ${await utils_2.default.getPrimaryUser()}\n`);
         for (const dir of dirs) {
             cmds.push(startLine);
             if (n8_1.default.isDirectory(dir)) {
@@ -850,7 +857,7 @@ class Ovary {
         }
         const cmds = [];
         cmds.push('# NOTE: home, cdrom, dev, live, media, mnt, proc, run, sys and tmp', `#       need just to be removed in ${this.settings.work_dir.merged}`);
-        cmds.push(`# host: ${node_os_1.default.hostname()} user: ${utils_2.default.getPrimaryUser()}\n`);
+        cmds.push(`# host: ${node_os_1.default.hostname()} user: ${await utils_2.default.getPrimaryUser()}\n`);
         // await exec(`/usr/bin/pkill mksquashfs; /usr/bin/pkill md5sum`, {echo: true})
         if (fs_1.default.existsSync(this.settings.work_dir.merged)) {
             const bindDirs = fs_1.default.readdirSync(this.settings.work_dir.merged, {
@@ -944,36 +951,33 @@ class Ovary {
         cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' rm /home/' + this.settings.config.user_opt + ' -rf', this.verbose));
         cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' mkdir /home/' + this.settings.config.user_opt, this.verbose));
         cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' useradd ' + this.settings.config.user_opt + ' --home-dir /home/' + this.settings.config.user_opt + ' --shell /bin/bash ', this.verbose));
-        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo ' + this.settings.config.user_opt + ':' + this.settings.config.user_opt_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
         cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', this.verbose));
-        // cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', verbose))
         cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' chown ' + this.settings.config.user_opt + ':users' + ' /home/' + this.settings.config.user_opt + ' -R', this.verbose));
+        // live password
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo ' + this.settings.config.user_opt + ':' + this.settings.config.user_opt_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
+        // root password
+        cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo root:' + this.settings.config.root_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
         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}`, this.verbose));
-            // educaandos
-            if (this.settings.config.theme === 'educaandos') {
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG adm ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG cdrom ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG dip ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG plugdev ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG lpadmin ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sambashare ${this.settings.config.user_opt}`, this.verbose));
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG admin ${this.settings.config.user_opt}`, this.verbose));
-            }
         }
         else if (this.familyId === 'archlinux') {
-            // adduser live to wheel and autologin
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose))
-            // in manjaro they use autologin group for the iso, if not exist create it
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} test $(grep "autologin" /etc/group) || chroot ${this.settings.work_dir.merged} groupadd -r autologin`, this.verbose))
-            // cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG autologin ${this.settings.config.user_opt}`, this.verbose))
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} wheel`, this.verbose));
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} sudo`, this.verbose));
             cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} autologin`, this.verbose));
         }
-        if (this.familyId === 'debian' || this.familyId === 'archlinux') {
-            cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' echo root:' + this.settings.config.root_passwd + '| chroot ' + this.settings.work_dir.merged + ' chpasswd', this.verbose));
+        /**
+         * educaandos and others themes
+         * users.yml
+         */
+        let usersConf = node_path_1.default.resolve(__dirname, `../../addons/${this.theme}/theme/calamares/users.yml`);
+        if (this.theme.includes('/')) {
+            usersConf = `${this.theme}/theme/calamares/modules/users.yml`;
+        }
+        if (fs_1.default.existsSync(usersConf)) {
+            const o = js_yaml_1.default.load(fs_1.default.readFileSync(usersConf, 'utf-8'));
+            for (const group of o.defaultGroups) {
+                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG ${group} ${this.settings.config.user_opt}`, this.verbose));
+            }
         }
     }
     /**
@@ -1111,7 +1115,7 @@ class Ovary {
             fs_1.default.writeFileSync(script, text, 'utf8');
             await (0, utils_1.exec)(`chmod a+x ${script}`, this.echo);
         }
-        await xdg_1.default.autologin(utils_2.default.getPrimaryUser(), this.settings.config.user_opt, this.settings.work_dir.merged);
+        await xdg_1.default.autologin(await utils_2.default.getPrimaryUser(), this.settings.config.user_opt, this.settings.work_dir.merged);
     }
     /**
      * Creazione link desktop per lxde
@@ -1205,7 +1209,10 @@ class Ovary {
         * copy splash to efiWorkDir
         */
         const splashDest = `${efiWorkDir}/boot/grub/splash.png`;
-        const splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        let splashSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/splash.png`);
+        if (this.theme.includes('/')) {
+            splashSrc = `${theme}/theme/livecd/splash.png`;
+        }
         if (!fs_1.default.existsSync(splashSrc)) {
             utils_2.default.warning('Cannot find: ' + splashSrc);
             process.exit();
@@ -1215,7 +1222,10 @@ class Ovary {
          * copy theme
          */
         const themeDest = `${efiWorkDir}/boot/grub/theme.cfg`;
-        const themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        let themeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        if (this.theme.includes('/')) {
+            themeSrc = `${theme}/theme/livecd/grub.theme.cfg`;
+        }
         if (!fs_1.default.existsSync(themeSrc)) {
             utils_2.default.warning('Cannot find: ' + themeSrc);
             process.exit();
@@ -1287,7 +1297,10 @@ class Ovary {
         await (0, utils_1.exec)(`rsync -avx ${efiWorkDir}/efi  ${isoDir}/`, this.echo);
         // 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`);
+        let grubThemeSrc = node_path_1.default.resolve(__dirname, `../../addons/${theme}/theme/livecd/grub.theme.cfg`);
+        if (this.theme.includes('/')) {
+            grubThemeSrc = `${theme}/theme/livecd/grub.theme.cfg`;
+        }
         const grubThemeDest = `${isoDir}/boot/grub/theme.cfg`;
         if (!fs_1.default.existsSync(grubThemeSrc)) {
             utils_2.default.warning('Cannot find: ' + grubThemeSrc);
@@ -1311,7 +1324,7 @@ class Ovary {
             if (this.settings.distro.distroId === 'ManjaroLinux') {
                 kernel_parameters += ` misobasedir=manjaro misolabel=${volid}`;
             }
-            else if (this.settings.distro.distroId === 'Arch') {
+            else if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
                 kernel_parameters += ` archisobasedir=arch archisolabel=${volid} cow_spacesize=4G`;
             }
         }

package/dist/classes/pxe.js

@@ -42,7 +42,7 @@ class Pxe {
         await this.settings.load();
         if (utils_1.default.isLive()) {
             this.eggRoot = this.settings.distro.liveMediumPath;
-            if (this.settings.distro.distroId === 'Arch') {
+            if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
                 this.eggRoot = '/run/archiso/bootmnt/';
                 await (0, utils_2.exec)(`mkdir ${this.eggRoot} -p`);
                 await (0, utils_2.exec)(`mount /dev/sr0 ${this.eggRoot}`);
@@ -128,7 +128,7 @@ class Pxe {
         if (this.settings.distro.distroId === 'ManjaroLinux') {
             await this.tryCatch(`ln -s ${this.eggRoot}manjaro ${this.pxeRoot}/manjaro`);
         }
-        else if (this.settings.distro.distroId === 'Arch') {
+        else if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
             await this.tryCatch(`ln -s ${this.eggRoot}arch ${this.pxeRoot}/arch`);
         }
         if (fs_1.default.existsSync(this.eggRoot)) {

package/dist/classes/settings.js

@@ -211,7 +211,7 @@ class Settings {
     async loadRemix(basename = '', theme = '') {
         this.remix.versionNumber = utils_1.default.getPackageVersion();
         this.remix.kernel = utils_1.default.kernelVersion();
-        this.remix.branding = theme === '' ? 'eggs' : theme;
+        this.remix.branding = theme === '' ? 'eggs' : this.remix.branding = theme.substring(theme.lastIndexOf('/') + 1);
         this.remix.name = this.config.snapshot_basename;
         let name = this.config.snapshot_prefix + this.config.snapshot_basename;
         name = name.replace(/-/g, ' ').replace('egg of ', '');

package/dist/classes/tailor.js

@@ -331,7 +331,7 @@ class Tailor {
                      * Copyng skel in /home/user
                      */
                     if (fs_1.default.existsSync(`${this.costume}/dirs/etc/skel`)) {
-                        const user = utils_1.default.getPrimaryUser();
+                        const user = await utils_1.default.getPrimaryUser();
                         step = `copying skel in /home/${user}/`;
                         utils_1.default.warning(step);
                         cmd = `rsync -avx  ${this.costume}/dirs/etc/skel/.config /home/${user}/`;

package/dist/classes/utils.js

@@ -19,6 +19,8 @@ const pacman_1 = tslib_1.__importDefault(require("./pacman"));
 // import { green, whiteBright } from 'chalk'
 const child_process_1 = require("child_process");
 const netmask_1 = require("netmask");
+// libraries
+const utils_1 = require("../lib/utils");
 const distro_1 = tslib_1.__importDefault(require("./distro"));
 const pjson = require('../../package.json');
 /**
@@ -94,7 +96,7 @@ class Utils {
         }
         // Arch
         let distro = new distro_1.default();
-        if (distro.distroId === 'Arch') {
+        if (distro.distroId === 'Arch' || distro.distroId === 'RebornOS') {
             vmlinuz = '/boot/vmlinuz-linux';
         }
         // btrfs
@@ -128,7 +130,7 @@ class Utils {
             version = vmlinuz.substring(vmlinuz.indexOf('-'));
         }
         let distro = new distro_1.default();
-        if (distro.distroId === 'Arch') {
+        if (distro.distroId === 'Arch' || distro.distroId === 'RebornOS') {
             initrd = '/boot/initramfs-linux.img';
         }
         else {
@@ -162,14 +164,10 @@ class Utils {
     /**
      * Return the primary user's name
      */
-    static getPrimaryUser() {
-        // const primaryUser = shx.exec('echo $SUDO_USER', { silent: true }).stdout.trim()
-        let primaryUser = '';
-        if (process.env.SUDO_USER !== undefined) {
-            primaryUser = process.env.SUDO_USER;
-        }
+    static async getPrimaryUser() {
+        let primaryUser = (await (0, utils_1.exec)('/usr/bin/logname', { echo: false, ignore: false, capture: true })).data.trim();
         if (primaryUser === '') {
-            console.log('Cannot find your user name. Log as normal user and run: $sudo eggs [COMMAND]');
+            console.log(`Cannot find your user name...`);
             process.exit(1);
         }
         return primaryUser;
@@ -866,7 +864,7 @@ class Utils {
     static async wardrobe() {
         let wardrobe = `${os_1.default.homedir()}/.wardrobe`;
         if (Utils.isRoot()) {
-            wardrobe = `/home/${Utils.getPrimaryUser()}/.wardrobe`;
+            wardrobe = `/home/${await Utils.getPrimaryUser()}/.wardrobe`;
             // let result = await exec(`echo $(logname)`, { echo: false, capture: true })
             // let result = await exec(`echo $(SUDO_USER)`, { echo: false, capture: true })
             //if (result.code === 0) {

package/dist/classes/xdg.js

@@ -35,7 +35,7 @@ class Xdg {
         else {
             xdg_dirs.forEach(async (dir) => {
                 if (dir === xdg_dir) {
-                    retval = node_path_1.default.basename(shelljs_1.default.exec(`sudo -u ${utils_1.default.getPrimaryUser()} xdg-user-dir ${dir}`, { silent: true }).stdout.trim());
+                    retval = node_path_1.default.basename(shelljs_1.default.exec(`sudo -u ${await utils_1.default.getPrimaryUser()} xdg-user-dir ${dir}`, { silent: true }).stdout.trim());
                 }
             });
         }
@@ -207,6 +207,8 @@ class Xdg {
             await (0, utils_2.exec)(`mkdir /etc/skel/.local/share -p`, echo);
             await rsyncIfExist(`/home/${user}/.local/share/recently-used.xbel`, '/etc/skel/.local/share', verbose);
         }
+        // .linuxfx we need it for linuxfx
+        await rsyncIfExist(`/home/${user}/.linuxfx`, `/etc/skel`, verbose);
         await (0, utils_2.exec)('chown root:root /etc/skel -R', echo);
         await (0, utils_2.exec)('chmod a+rwx,g-w,o-w /etc/skel/ -R', echo);
         await execIfExist('chmod a+rwx,g-w-x,o-wx', '/etc/skel/.bashrc', verbose);

package/dist/commands/calamares.js

@@ -70,7 +70,7 @@ class Calamares extends core_1.Command {
                         if (await this.settings.load()) {
                             utils_1.default.warning('Configuring installer');
                             await this.settings.loadRemix(this.settings.config.snapshot_basename, theme);
-                            this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, verbose);
+                            this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, theme, verbose);
                             await this.incubator.config(release);
                         }
                     }
@@ -91,7 +91,7 @@ class Calamares extends core_1.Command {
             else if ((await utils_1.default.customConfirm('Select yes to continue...')) && (await this.settings.load())) {
                 utils_1.default.warning('Configuring krill');
                 await this.settings.loadRemix(this.settings.config.snapshot_basename, theme);
-                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, verbose);
+                this.incubator = new incubator_1.default(this.settings.remix, this.settings.distro, this.settings.config.user_opt, theme, verbose);
                 console.log('calamares relase: ' + release);
                 await this.incubator.config(release);
             }

package/dist/commands/produce.js

@@ -80,6 +80,15 @@ class Produce extends core_1.Command {
             let theme = 'eggs';
             if (flags.theme !== undefined) {
                 theme = flags.theme;
+                if (theme.includes('/')) {
+                    if (theme.endsWith('/')) {
+                        theme = theme.substring(0, theme.length - 1);
+                    }
+                    if (!node_fs_1.default.existsSync(theme + '/theme')) {
+                        console.log('Cannot find theme: ' + theme);
+                        process.exit();
+                    }
+                }
             }
             const nointeractive = false;
             const i = await config_1.default.thatWeNeed(nointeractive, verbose, backup);

package/dist/commands/tools/skel.js

@@ -20,7 +20,7 @@ class Skel extends core_1.Command {
             verbose = true;
         }
         let user = '';
-        user = flags.user ? flags.user : utils_1.default.getPrimaryUser();
+        user = flags.user ? flags.user : await utils_1.default.getPrimaryUser();
         utils_1.default.warning(`user: ${user}`);
         const homeSource = `/home/${user}`;
         if (!fs_1.default.existsSync(homeSource)) {

package/dist/krill/krill-sequence.js

@@ -405,7 +405,7 @@ class Sequence {
                     message = "autologin GUI";
                     percent = 0.65;
                     if (this.users.autologin) {
-                        await xdg_1.default.autologin(utils_1.default.getPrimaryUser(), this.users.name, this.installTarget);
+                        await xdg_1.default.autologin(await utils_1.default.getPrimaryUser(), this.users.name, this.installTarget);
                     }
                     await redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
                 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.3.7",
+  "version": "9.3.9",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"
   },
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
-    "@oclif/core": "^1.19.1",
+    "@oclif/core": "^1.20.4",
     "@oclif/plugin-autocomplete": "1.3.3",
     "@oclif/plugin-help": "^5.1.16",
     "@oclif/plugin-not-found": "^2.3.6",

package/addons/neon/theme/applications/install-debian.desktop

@@ -1,28 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install Linux
-GenericName=Calamares Installer
-Exec=/sbin/install-debian
-Comment=Calamares — Installer for Debian Live
-Keywords=calamares;system;install;debian;installer
-Icon=install-debian
-Terminal=false
-Categories=Qt;System;
-StartupWMClass=calamares
-StartupNotify=True
-Name[it]=Installa sistema
-GenericName[it]=Installa sistema
-Comment[it]=Installazione sistema GUI
-Name[en]=Install system
-GenericName[en]=Install the system
-Comment[en]=Install the system GUI
-Name[es]=Instalación del sistema
-GenericName[es]=Instalación del sistema
-Comment[es]=Instalación del sistema GUI
-Name[pt]=Instalação do sistema
-GenericName[pt]=Instalação do sistema
-Comment[pt]=Instalação do sistema  GUI
-Name[fr]=Installation du système
-GenericName[fr]=Installation du système
-Comment[fr]=Installation du système  GUI

package/addons/neon/theme/calamares/branding/branding.desc

@@ -1 +0,0 @@
-# this is only a stub