penguins-eggs 9.5.2 → 9.5.4

package/conf/distros/rolling/calamares-32/settings.yml

@@ -0,0 +1,91 @@
+# Manjaro
+# Calamares 3.2
+# setiing
+---
+# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
+modules-search: [local, /usr/lib/calamares/modules, /usr/share/calamares]
+
+instances:
+- id:       cleanup
+  module:   shellprocess
+  config:   shellprocess_cleanup.conf
+
+sequence:
+  # Phase 1 - prepare.
+  # View modules are shown as UI pages, jobs from job modules
+  # are executed immediately in the background.
+  # Jobs should be executed sparingly (if at all) in this phase.
+  - show:
+      - welcome
+      - locale
+      - keyboard
+      - partition
+      - users
+      - summary
+
+  # Phase 2 - install.
+  # View modules are not shown. Only the view modules shown
+  # in the previous phase are allowed, their names should be
+  # added here as placeholders to specify the order in which
+  # view module jobs should be enqueued. Job modules are
+  # also allowed.
+  - exec:
+      - partition
+      - mount
+      - unpackfs
+      - machineid
+      - fstab
+      - locale
+      - keyboard
+      - localecfg
+      - users
+      - displaymanager 
+      - networkcfg
+      - hwclock
+      - grubcfg
+      - bootloader
+      - packages
+      - luksbootkeyfile
+      - plymouthcfg
+      - removeuser
+      # shellprocess removelink
+      - umount
+
+  # Phase 3 - postinstall.
+  # View modules are shown as UI pages, jobs from job modules are
+  # executed immediately in the background.
+  # Jobs should be executed sparingly (if at all) in this phase.
+  - show:
+      - finished
+
+# A branding component is a directory, either in
+# SHARE/calamares/branding or in /etc/calamares/branding
+# (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources
+# (such as images) as paths relative to the current directory.
+# Only the name of the branding component (directory) should be
+# specified here, Calamares then takes care of finding it and
+# loading the contents.
+branding: eggs
+
+# If this is set to true, Calamares will show an "Are you sure?" prompt right
+# before each execution phase, i.e. at points of no return. If this is set to
+# false, no prompt is shown. Default is false.
+#
+# YAML: boolean.
+prompt-install: false
+
+# If this is set to true, Calamares will execute all target environment
+# commands in the current environment, without chroot. This setting should
+# only be used when setting up Calamares as a post-install configuration tool,
+# as opposed to a full operating system installer.
+#
+# Some official Calamares modules are not expected to function with this
+# setting. (e.g. partitioning seems like a bad idea, since that is expected to
+# have been done already)
+#
+# Default is false (for a normal installer).
+#
+# YAML: boolean.
+dont-chroot: false
+

package/dist/classes/incubation/installer.js

@@ -36,6 +36,9 @@ function installer() {
     const distro = new distro_1.default(remix);
     if (distro.isCalamaresAvailable) {
         installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/calamares/';
+        if (distro.distroId === 'ManjaroLinux') {
+            installer.template = '/etc/penguins-eggs.d/distros/' + distro.codenameLikeId + '/calamares-32/';
+        }
         installer.templateModules = installer.template + 'modules/';
         installer.templateMultiarch = installer.template + 'calamares-modules/';
     }

package/dist/classes/ovary.js

@@ -1413,7 +1413,10 @@ class Ovary {
      */
     xorrisoCommand(clone = false, cryptedclone = false) {
         const volid = utils_2.default.getVolid(this.settings.remix.name);
-        const prefix = this.settings.config.snapshot_prefix;
+        let prefix = this.settings.config.snapshot_prefix;
+        if (prefix.endsWith('rolling-')) {
+            prefix = prefix.substring(0, prefix.indexOf('rolling-'));
+        }
         let typology = '';
         // typology is applied only with standard egg-of
         if (prefix.slice(0, 7) === 'egg-of-') {

package/dist/classes/pxe.js

@@ -205,7 +205,9 @@ class Pxe {
                      * ARCH LINUX
                      */
             let tool = 'archiso';
-            if (distro.codenameId === 'Qonos' || distro.codenameId === 'Ruah' || distro.codenameId === 'Sikaris') {
+            if (distro.codenameId === 'Qonos' || distro.codenameId === 'Ruah' ||
+                distro.codenameId === 'Sikaris' || distro.codenameId === 'Talos' ||
+                distro.codenameId === 'UltimaThule') {
                 tool = 'miso';
             }
             content += `kernel http://${utils_2.default.address()}/vmlinuz\n`;
@@ -275,7 +277,7 @@ class Pxe {
                      * ARCH LINUX
                      */
             let tool = 'archiso';
-            if (this.settings.distro.codenameId === 'Qonos' || this.settings.distro.codenameId === 'Ruah' || this.settings.distro.codenameId === 'Sikaris') {
+            if (this.settings.distro.codenameId === 'Qonos' || this.settings.distro.codenameId === 'Ruah' || this.settings.distro.codenameId === 'Sikaris' || this.settings.distro.codenameId === 'UltimaThule') {
                 tool = 'miso';
             }
             content += `imgargs vmlinuz ${tool}_http_srv=http://${utils_2.default.address()}/ boot=live dhcp initrd=initrd ro\n`;

package/dist/classes/tools.js

@@ -47,7 +47,11 @@ class Tools {
             const settings = new settings_1.default();
             settings.load();
             this.snapshot_dir = settings.config.snapshot_dir;
-            this.snapshot_name = settings.config.snapshot_prefix + settings.config.snapshot_basename + '_'; // + Utils.machineArch() + '_'
+            let prefix = settings.config.snapshot_prefix;
+            if (prefix.endsWith('rolling-')) {
+                prefix = prefix.substring(0, prefix.indexOf('rolling-'));
+            }
+            this.snapshot_name = prefix + settings.config.snapshot_basename + '_'; // + Utils.machineArch() + '_'
         }
         else {
             console.log(`Can't find: ${this.tools_yaml}`);

package/dist/commands/produce.js

@@ -80,8 +80,14 @@ class Produce extends core_1.Command {
             let theme = 'eggs';
             if (flags.theme !== undefined) {
                 theme = flags.theme;
-                if (theme.endsWith('/')) {
-                    theme = theme.substring(0, theme.length - 1);
+                if (theme.includes('/')) {
+                    if (theme.endsWith('/')) {
+                        theme = theme.substring(0, theme.length - 1);
+                    }
+                }
+                else {
+                    const wpath = `/home/${await utils_1.default.getPrimaryUser()}/.wardrobe/vendors/`;
+                    theme = wpath + flags.theme;
                 }
                 theme = node_path_1.default.resolve(theme);
                 if (!node_fs_1.default.existsSync(theme + '/theme')) {
@@ -89,7 +95,6 @@ class Produce extends core_1.Command {
                     process.exit();
                 }
             }
-            console.log(`theme: ${theme}`);
             const i = await config_1.default.thatWeNeed(nointeractive, verbose, cryptedclone);
             if ((i.needApt || i.configurationInstall || i.configurationRefresh || i.distroTemplate) && (await utils_1.default.customConfirm('Select yes to continue...'))) {
                 await config_1.default.install(i, nointeractive, verbose);

package/dist/commands/tools/ppa.js

@@ -20,6 +20,9 @@ const flist = '/etc/apt/sources.list.d/penguins-eggs-ppa.list';
  *
  */
 class Ppa extends core_1.Command {
+    /**
+     *
+     */
     async run() {
         const { flags } = await this.parse(Ppa);
         utils_1.default.titles(this.id + ' ' + this.argv);
@@ -28,26 +31,47 @@ class Ppa extends core_1.Command {
             verbose = true;
         }
         const nointeractive = flags.nointeractive;
-        const distro = new distro_1.default();
-        if (distro.familyId === 'debian') {
-            if (utils_1.default.isRoot()) {
-                if (flags.remove) {
+        if (utils_1.default.isRoot()) {
+            const distro = new distro_1.default();
+            /**
+             * Debian
+             */
+            if (distro.familyId === 'debian') {
+                if (flags.add) {
+                    utils_1.default.warning(`Are you sure to add ${flist} to your repositories?`);
+                    if (nointeractive || await utils_1.default.customConfirm('Select yes to continue...')) {
+                        await debianAdd();
+                    }
+                }
+                else if (flags.remove) {
                     utils_1.default.warning(`Are you sure to remove ${flist} to your repositories?`);
                     if (nointeractive || await utils_1.default.customConfirm('Select yes to continue...')) {
-                        await remove();
+                        await debianRemove();
                     }
                 }
+                /**
+                 * archlinux
+                 */
+            }
+            if (distro.familyId === 'archlinux') {
                 if (flags.add) {
-                    utils_1.default.warning(`Are you sure to add ${flist} to your repositories?`);
-                    if (nointeractive || await utils_1.default.customConfirm('Select yes to continue...')) {
-                        await clean();
-                        await add();
+                    if (distro.distroId !== 'ManjaroLinux') {
+                        utils_1.default.warning(`Are you sure to add chaotic-aur to your repositories?`);
+                        if (await utils_1.default.customConfirm('Select yes to continue...')) {
+                            await archAdd();
+                        }
                     }
                 }
+                else if (flags.remove) {
+                    await archRemove();
+                }
+            }
+            else {
+                /**
+                 * Others
+                 */
+                utils_1.default.warning(`Distro> ${distro.distroId}/${distro.codenameId}, cannot use this command here!`);
             }
-        }
-        else {
-            utils_1.default.warning('you can use ppa only for debian family');
         }
     }
 }
@@ -58,33 +82,65 @@ Ppa.flags = {
     remove: core_1.Flags.boolean({ char: 'r', description: 'remove penguins-eggs PPA repository' }),
     verbose: core_1.Flags.boolean({ char: 'v', description: 'verbose' }),
 };
-Ppa.description = 'add/remove PPA repositories (Debian family)';
+Ppa.description = 'add/remove repo';
 Ppa.examples = [
     'sudo eggs tools ppa --add',
     'sudo eggs tools ppa --remove',
 ];
 exports.default = Ppa;
 /**
- * add ppa
+ * archAdd
  */
-async function add() {
-    await (0, utils_2.exec)(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${fkey} > /dev/null`);
-    const content = `deb [signed-by=${fkey}] https://pieroproietti.github.io/penguins-eggs-ppa ./\n`;
-    fs_1.default.writeFileSync(flist, content);
-    await (0, utils_2.exec)('apt-get update');
+async function archAdd() {
+    const path = "/var/cache/pacman/pkg/";
+    const keyring = "chaotic-keyring.pkg.tar.zst";
+    const mirrorlist = "chaotic-mirrorlist.pkg.tar.zst";
+    const echo = utils_1.default.setEcho(true);
+    if (fs_1.default.existsSync(path + keyring) && (fs_1.default.existsSync(path + mirrorlist))) {
+        console.log("repository chaotic-aur, already present!");
+        await archRemove();
+        process.exit();
+    }
+    await (0, utils_2.exec)('pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com', echo);
+    await (0, utils_2.exec)('pacman-key --lsign-key FBA220DFC880C036', echo);
+    await (0, utils_2.exec)("pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'", echo);
+    // Append to /etc/pacman.conf
+    const chaoticAppend = "\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist\n\n";
+    fs_1.default.appendFileSync('/etc/pacman.conf', chaoticAppend);
+}
+/**
+ * archRemove
+ */
+async function archRemove() {
+    const path = "/var/cache/pacman/pkg/";
+    const keyring = "chaotic-keyring.pkg.tar.zst";
+    const mirrorlist = "chaotic-mirrorlist.pkg.tar.zst";
+    const echo = utils_1.default.setEcho(true);
+    if (fs_1.default.existsSync(path + keyring) && (fs_1.default.existsSync(path + mirrorlist))) {
+        console.log('to remove chaotic-aur:\n');
+        console.log(`sudo rm ${path}${keyring}`);
+        console.log(`sudo rm ${path}${mirrorlist}`);
+        console.log(`sudo nano /etc/pacman.conf`);
+        console.log(`remove at the end:`);
+        console.log(`[chaotic-aur]`);
+        console.log(`Include = /etc/pacman.d/chaotic-mirrorlist`);
+    }
 }
 /**
- * remove ppa
+ * debianAdd
  */
-async function remove() {
-    await clean();
+async function debianAdd() {
+    await (0, utils_2.exec)(`curl -sS https://pieroproietti.github.io/penguins-eggs-ppa/KEY.gpg| gpg --dearmor | sudo tee ${fkey} > /dev/null`);
+    const content = `deb [signed-by=${fkey}] https://pieroproietti.github.io/penguins-eggs-ppa ./\n`;
+    fs_1.default.writeFileSync(flist, content);
     await (0, utils_2.exec)('apt-get update');
 }
 /**
- *
+ * debianRemove
  */
-async function clean() {
-    await (0, utils_2.exec)('rm -f    /etc/apt/trusted.gpg.d/penguins-eggs*');
+async function debianRemove() {
+    await (0, utils_2.exec)('rm -f /etc/apt/trusted.gpg.d/penguins-eggs*');
     await (0, utils_2.exec)('rm -f /etc/apt/sources.list.d/penguins-eggs*');
     await (0, utils_2.exec)('rm -f /usr/share/keyrings/penguins-eggs*');
+    await (0, utils_2.exec)('apt-get update');
 }

package/dist/commands/wardrobe/list.js

@@ -71,7 +71,7 @@ class List extends core_1.Command {
         for (const costume of costumes) {
             if (fs_1.default.existsSync(`${wardrobe}costumes/${costume}/${index}`)) {
                 const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}costumes/${costume}/${index}`, 'utf-8'));
-                console.log(chalk_1.default.cyan(costume) + ': ' + materials.description);
+                console.log('- ' + chalk_1.default.cyan(costume) + ': ' + materials.description);
             }
         }
         console.log();
@@ -83,7 +83,7 @@ class List extends core_1.Command {
         for (const accessory of accessories) {
             if (fs_1.default.existsSync(`${wardrobe}/accessories/${accessory}/${index}`)) {
                 const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/accessories/${accessory}/${index}`, 'utf-8'));
-                console.log(chalk_1.default.cyan(accessory) + ': ' + materials.description);
+                console.log('- ' + chalk_1.default.cyan(accessory) + ': ' + materials.description);
             }
         }
         console.log();
@@ -95,7 +95,18 @@ class List extends core_1.Command {
         for (const server of servers) {
             if (fs_1.default.existsSync(`${wardrobe}/servers/${server}/${index}`)) {
                 const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/servers/${server}/${index}`, 'utf-8'));
-                console.log(chalk_1.default.cyan(server) + ': ' + materials.description);
+                console.log('- ' + chalk_1.default.cyan(server) + ': ' + materials.description);
+            }
+        }
+        console.log();
+        /**
+         * vendors
+         */
+        const vendors = fs_1.default.readdirSync(`${wardrobe}/vendors/`);
+        console.log(chalk_1.default.green('vendors/themes: '));
+        for (const vendor of vendors) {
+            if (fs_1.default.existsSync(`${wardrobe}/vendors/${vendor}/theme`)) {
+                console.log('- ' + chalk_1.default.cyan(vendor));
             }
         }
         console.log();

package/dist/krill/krill-prepare.js

@@ -187,8 +187,12 @@ class Krill {
             drives.forEach((element) => {
                 driveList.push('/dev/' + element);
             });
+            let installationDevice = driveList[0];
+            if (driveList.length > 1) {
+                installationDevice = await (0, select_installation_device_1.default)();
+            }
             oPartitions = {
-                installationDevice: driveList[0],
+                installationDevice: installationDevice,
                 installationMode: this.krillConfig.installationMode,
                 filesystemType: this.krillConfig.filesystemType,
                 userSwapChoice: this.krillConfig.userSwapChoice
@@ -363,6 +367,7 @@ class Krill {
     * PARTITIONS
     */
     async partitions(crypted = false, pve = false) {
+        // Calamares won't use any devices with iso9660 filesystem on it.
         const drives = shelljs_1.default.exec('lsblk |grep disk|cut -f 1 "-d "', { silent: true }).stdout.trim().split('\n');
         const driveList = [];
         drives.forEach((element) => {

package/dist/krill/krill-sequence.js

@@ -168,7 +168,12 @@ class Sequence {
          * To let krill to work with Arch we need:
          */
         if (this.distro.familyId === 'archlinux') {
-            await (0, utils_2.exec)(`sudo ln -s /run/archiso/bootmnt/live/ /live`);
+            if (this.distro.distroId === 'ManjaroLinux') {
+                await (0, utils_2.exec)(`sudo ln -s /run/miso/bootmnt/live/ /live`);
+            }
+            else {
+                await (0, utils_2.exec)(`sudo ln -s /run/archiso/bootmnt/live/ /live`);
+            }
         }
         this.unattended = unattended;
         this.nointeractive = nointeractive;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.5.2",
+  "version": "9.5.4",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"

package/scripts/force-calamares.sh

@@ -0,0 +1,9 @@
+echo SigLevel = Never
+sudo rm /etc/calamares -rf
+sudo rm /etc/ts.conf
+sudo rm /etc/xdg/ui/ui_standards.rc
+sudo rm /etc/xdg/menus/applications.menu
+sudo rm /etc/xdg/accept-languages.codes
+sudo rm /etc/xdg/kshorturifilterrc
+sudo eggs calamares --install
+

package/conf/distros/rolling/README.md

@@ -1,3 +0,0 @@
-# Archlinux
-
-do to