penguins-eggs 25.9.3 → 25.9.7

package/dist/commands/update.js

@@ -53,20 +53,16 @@ export default class Update extends Command {
         const choose = await this.choosePkg();
         Utils.titles(`updating via ${choose}`);
         switch (choose) {
-            case 'repos': {
-                await this.getPkgFromRepo();
-                break;
-            }
-            case 'lan': {
+            case 'LAN': {
                 await this.getPkgFromLan();
                 break;
             }
-            case 'sourceforge': {
-                this.getPkgFromSourceforge();
+            case 'Package_Manager': {
+                await this.getPkgFromPackageManager();
                 break;
             }
-            case 'sources': {
-                this.getFromSources();
+            case 'Source': {
+                this.getFromSource();
                 break;
             }
             // No default
@@ -76,18 +72,18 @@ export default class Update extends Command {
      *
      */
     async choosePkg() {
-        const choices = ['abort'];
-        choices.push('lan', 'repos', 'sourceforge', 'sources');
+        const choices = ['Abort'];
+        choices.push('LAN', 'Source', 'Package_Manager');
         const questions = [
             {
                 choices,
-                message: 'select update method',
+                message: 'Select update method',
                 name: 'selected',
                 type: 'list'
             }
         ];
         const answer = await inquirer.prompt(questions);
-        if (answer.selected === 'abort') {
+        if (answer.selected === 'Abort') {
             process.exit(0);
         }
         return answer.selected;
@@ -95,19 +91,31 @@ export default class Update extends Command {
     /**
      *
      */
-    async getPkgFromRepo() {
+    async getPkgFromPackageManager() {
         let cmd = "";
-        if (this.distro.familyId === "debian") {
-            cmd = 'apt install penguins-eggs';
+        if (this.distro.familyId === 'alpine') {
+            cmd = `doas apk add penguins-egga`;
         }
         else if (this.distro.familyId === 'archlinux') {
-            cmd = 'pacman -S penguins-eggs';
+            cmd = 'sudo pacman -S penguins-eggs';
+        }
+        else if (this.distro.familyId === "debian") {
+            cmd = 'sudo apt install penguins-eggs';
         }
-        else if (this.distro.familyId === 'alpine') {
-            cmd = `apk add penguins-egga`;
+        else if (this.distro.familyId === "fedora") {
+            cmd = 'sudo dnf install penguins-eggs\nsudo dnf install penguins-eggs';
         }
+        else if (this.distro.familyId === "openmamba") {
+            cmd = 'sudo dnf install penguins-eggs\nsudo dnf install penguins-eggs';
+        }
+        else if (this.distro.familyId === "opensuse") {
+            cmd = 'sudo zypper install penguins-eggs';
+        }
+        Utils.titles(`update`);
+        Utils.warning(`To update/install penguins-eggs cut and copy follow commands`);
+        console.log();
         console.log(cmd);
-        await exec(cmd);
+        console.log();
     }
     /**
      * download da LAN
@@ -115,92 +123,95 @@ export default class Update extends Command {
     async getPkgFromLan() {
         const Tu = new Tools();
         await Tu.loadSettings();
-        Utils.warning('Update from LAN');
-        if (this.distro.familyId === 'archlinux') {
+        Utils.warning('Update penguins-eggs from LAN');
+        let filter = '';
+        let copy = '';
+        let install = '';
+        /**
+         * Alpine
+         */
+        if (this.distro.familyId === 'alpine') {
+            let repo = `alpine/x86_64`;
+            filter = `penguins-eggs-*-*.*.?-r?.apk`;
+            copy = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
+            install = `apk add /tmp/${filter}`;
+            /**
+             * Arch
+             */
+        }
+        else if (this.distro.familyId === 'archlinux') {
             let repo = "aur";
+            filter = `penguins-eggs-??.*.*-?-any.pkg.tar.zst`;
             if (Diversions.isManjaroBased(this.distro.distroId)) {
                 repo = 'manjaro';
+                filter = `penguins-eggs-??.*.*-?-any.pkg.tar.*`;
             }
-            const filter = `penguins-eggs-25.*.*-?-any.pkg.tar.zst`;
-            const cmd = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
-            await exec(cmd, { capture: true, echo: true });
-            if (await Utils.customConfirm(`Want to install ${filter}`)) {
-                await exec(`pacman -U /tmp/${filter}`);
-            }
-        }
-        else if (this.distro.familyId === 'alpine') {
-            let arch = 'x86_64';
-            if (process.arch === 'ia32') {
-                arch = 'i386';
-            }
-            const filter = `penguins-eggs-25.*.*-r*.apk`;
-            const cmd = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/alpine/${filter} /tmp`;
-            await exec(cmd, { capture: true, echo: true });
-            if (await Utils.customConfirm(`Want to install ${filter}`)) {
-                await exec(`apk add /tmp/${filter}`);
-            }
+            copy = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
+            install = `pacman -U /tmp/${filter}`;
+            /**
+            * Devuan/Debian/Ubuntu
+            */
         }
         else if (this.distro.familyId === "debian") {
-            const filter = `penguins-eggs_25.*.*-*_${Utils.uefiArch()}.deb`;
-            const cmd = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/debs/${filter} /tmp`;
-            await exec(cmd, { capture: true, echo: true });
-            if (await Utils.customConfirm(`Want to install ${filter}`)) {
-                await exec(`dpkg -i /tmp/${filter}`);
-            }
+            let repo = 'debs';
+            filter = `penguins-eggs_??.*.*-?_${Utils.uefiArch()}.deb`;
+            copy = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
+            install = `dpkg -i /tmp/${filter}`;
+            /**
+            * fedora/el9
+            */
         }
-    }
-    /**
-     *
-     */
-    async getPkgFromSourceforge() {
-        let repo = '';
-        let cmd = '';
-        let url = 'https://sourceforge.net/projects/penguins-eggs/files/Packages';
-        let filter = `penguins-eggs`;
-        if (this.distro.familyId === 'archlinux') {
-            repo = "aur";
-            filter = `penguins-eggs-10.?.*-?-any.pkg.tar.zst`;
-            cmd = `sudo pacman -U ${filter}`;
-            if (Diversions.isManjaroBased(this.distro.distroId)) {
-                repo = 'manjaro';
+        else if (this.distro.familyId === "fedora") {
+            let repo = 'fedora';
+            let ftype = 'fc??';
+            if (this.distro.distroId !== 'Fedora') {
+                repo = 'el9';
+                ftype = 'el?';
             }
-            url = `${url}/${repo}`;
+            filter = `penguins-eggs-??.*.*-?.${ftype}.x86_64.rpm`;
+            copy = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
+            install = `dnf reinstall /tmp/${filter} || dnf install /tmp/${filter}`;
+            /**
+             * openmamba
+             */
         }
-        else if (this.distro.familyId === "alpine") {
-            let arch = 'x86_64';
-            if (process.arch === 'ia32') {
-                arch = 'i386';
-            }
-            repo = "alpine";
-            url = `${url}/${repo}/$arch/${Utils.uefiArch()}`;
-            const filter = `penguins-eggs-25.*.*-r*.apk`;
-            cmd = `doas apk add ${filter}`;
+        else if (this.distro.familyId === "openmamba") {
+            let repo = 'openmamba';
+            filter = `penguins-eggs-??.*.*-?mamba.x86_64.rpm`;
+            copy = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
+            install = `dnf reinstall /tmp/${filter} || dnf install /tmp/${filter}`;
+            /**
+             * opensuse
+             */
+        }
+        else if (this.distro.familyId === "opensuse") {
+            let repo = 'opensuse';
+            filter = `penguins-eggs-*.*.*-?.opensuse.x86_64.rpm`;
+            copy = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filter} /tmp`;
+            install = `zypper install /tmp/${filter}`;
+        }
+        /**
+         * copy and install
+         */
+        if (await Utils.customConfirm(`Want to update/reinstall penguins-eggs`)) {
+            await exec(copy, { capture: true, echo: true });
+            await exec(install);
         }
-        else if (this.distro.familyId === "debian") {
-            repo = "debs";
-            url = `${url}/${repo}`;
-            filter = `penguins-eggs_25.*.*-*_${Utils.uefiArch()}.deb`;
-            cmd = `sudo apt-get install ./${filter}`;
-        }
-        let command = `- open your browser at ${url}\n`;
-        command += `- select and download last package: ${filter}\n`;
-        command += `- ${cmd}\n`;
-        console.log(command);
-        this.show(url);
     }
     /**
-   *
-   * @param aptVersion
-   */
-    getFromSources() {
-        console.log('You can get a fresh installation, cloning penguins-eggs:');
+     *
+     */
+    getFromSource() {
+        console.log('Use the following commands to use penguins-eggs from source:');
+        console.log('');
         console.log('cd ~');
         console.log('git clone https://github.com/pieroproietti/penguins-eggs');
+        console.log('cd penguins-eggs');
+        console.log('pnpm install');
+        console.log('pnpm build');
+        console.log('./eggs');
         console.log('');
-        console.log('Then, open your browser to read detailed instructions:');
-        console.log('https://github.com/pieroproietti/penguins-eggs/blob/master/PREREQUISITES/README.md');
-        console.log('');
-        console.log('');
+        console.log('NOTE: requires nodejs>18 and pnpm installed');
     }
     /**
      * show

package/dist/krill/classes/sequence.d/bootloader.js

@@ -19,7 +19,6 @@ export default async function bootloader() {
     let grubName = Diversion.grubName(this.distro.familyId);
     let grubForce = Diversion.grubForce(this.distro.familyId);
     let cmd = '';
-    let grubLog = '/grub-install.lgo';
     if (this.efi) {
         /**
          * UEFI Installation
@@ -42,7 +41,7 @@ export default async function bootloader() {
          * For legacy boot, we specify the installation device directly.
          */
         const target = 'i386-pc';
-        cmd = `chroot ${this.installTarget} ${grubName}-install --target=${target} ${this.partitions.installationDevice} ${grubForce} ${grubLog}`;
+        cmd = `chroot ${this.installTarget} ${grubName}-install --target=${target} ${this.partitions.installationDevice} ${grubForce}`;
     }
     // await Utils.debug(`grub-install: ${cmd}`)
     await exec(cmd, this.echo);

package/dist/krill/classes/sequence.d/bootloader_config.js

@@ -147,9 +147,7 @@ export default async function bootloaderConfig() {
             try {
                 cmd = ``;
                 cmd += `chroot ${this.installTarget} `;
-                cmd += `dnf -y install grub2 `;
-                cmd += `grub2-pc `;
-                cmd += `grub2-pc-modules ${this.toNull}`;
+                cmd += `dnf -y install grub ${this.toNull}`;
                 await exec(cmd, this.echo);
             }
             catch (error) {

package/dist/penguins-eggs_25.9.7-1_amd64.deb.sha256

@@ -0,0 +1 @@
+3930ad85d31d4d2446c15a710bc0263d2fdb86d17ab6632db42a07a5b60c7404  penguins-eggs_25.9.7-1_amd64.deb

package/dist/penguins-eggs_25.9.7-1_arm64.deb.sha256

@@ -0,0 +1 @@
+a6f9943c573d294c3d67e3c475cfd04fa80b4a97a5a25304ce93eaaae0251d0c  penguins-eggs_25.9.7-1_arm64.deb

package/dist/penguins-eggs_25.9.7-1_i386.deb.sha256

@@ -0,0 +1 @@
+590e0952befc90f777d12c52e8c7ce0ac5232637f0b61bfb5d7592038f5da3c3  penguins-eggs_25.9.7-1_i386.deb

package/package.json

@@ -2,7 +2,7 @@
     "name": "penguins-eggs",
     "shortName": "eggs",
     "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-    "version": "25.9.3",
+    "version": "25.9.7",
     "author": "Piero Proietti",
     "bin": {
         "eggs": "./bin/run.js"
@@ -51,7 +51,7 @@
         "@types/shelljs": "^0.8.17",
         "@types/ws": "^8.18.1",
         "chai": "^6.0.1",
-        "eslint": "^9.34.0",
+        "eslint": "^9.35.0",
         "eslint-config-oclif": "^6.0.101",
         "eslint-config-prettier": "^10.1.8",
         "glob": "^11.0.3",

package/dist/penguins-eggs_25.9.3-1_amd64.deb.sha256

@@ -1 +0,0 @@
-28ef347c6cbe76b3ed0df657751b9e4c77d540926b62d0429510873bc68d9b55  penguins-eggs_25.9.3-1_amd64.deb

package/dist/penguins-eggs_25.9.3-1_arm64.deb.sha256

@@ -1 +0,0 @@
-e87f2ff251f6d8043cec34f6679152f36aced09de133d46056cd546f4fbfc0bc  penguins-eggs_25.9.3-1_arm64.deb

package/dist/penguins-eggs_25.9.3-1_i386.deb.sha256

@@ -1 +0,0 @@
-52f636944437dab835f49e806f1e1718bc2322d4894ed81ae886909b97738bb0  penguins-eggs_25.9.3-1_i386.deb