penguins-eggs 25.7.22 → 25.7.30

package/dist/classes/ovary.d/xorriso-command.js

@@ -45,7 +45,7 @@ export async function xorrisoCommand(clone = false, cryptedclone = false) {
     // const preparer = '-preparer "prepared by eggs <https://penguins-eggs.net>" '
     let isoHybridMbr = '';
     if (this.settings.config.make_isohybrid) {
-        const isolinuxFile = this.settings.distro.syslinuxPath + '/isohdpfx.bin';
+        const isolinuxFile = path.resolve(__dirname, `../../../bootloaders/syslinux/isohdpfx.bin`);
         if (fs.existsSync(isolinuxFile)) {
             isoHybridMbr = `-isohybrid-mbr ${isolinuxFile}`;
         }

package/dist/commands/export/pkg.js

@@ -55,17 +55,7 @@ export default class ExportPkg extends Command {
         let localPath = '';
         let remotePath = '';
         let filter = '';
-        /**
-         * aldos
-         */
-        if (familyId === 'aldos') {
-            Utils.warning("aldos rpm");
-            process.exit();
-            /**
-             * alpine
-             */
-        }
-        else if (familyId === 'alpine') {
+        if (familyId === 'alpine') {
             let arch = 'x86_64';
             if (process.arch === 'ia32') {
                 arch = 'i386';
@@ -117,8 +107,14 @@ export default class ExportPkg extends Command {
         else if (familyId === 'fedora') {
             Utils.warning("fedora rpm packages");
             localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
-            remotePath = this.Tu.config.remotePathPackages + "/fedora";
-            filter = `penguins-eggs-[0-9][0-9].@([0-9]|[0-1][0-9]).@([0-9]|[0-3][0-9])-*fedora.*.rpm`;
+            if (distroId === 'fedora') {
+                remotePath = this.Tu.config.remotePathPackages + "/fedora";
+                filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.fc??.x86_64.rpm`;
+            }
+            else {
+                remotePath = this.Tu.config.remotePathPackages + "/el9";
+                filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.el?.x86_64.rpm`;
+            }
             /**
              * openmamba
              */
@@ -134,7 +130,9 @@ export default class ExportPkg extends Command {
         }
         else if (familyId === 'opensuse') {
             Utils.warning("opensuse rpm packages");
-            process.exit();
+            localPath = `/home/${this.user}/rpmbuild/RPMS/x86_64`;
+            remotePath = this.Tu.config.remotePathPackages + "/opensuse";
+            filter = `penguins-eggs-[0-9][0-9].[0-9]*.[0-9]*-*.opensuse.x86_64.rpm`;
             /**
              * voidlinux
              */
@@ -148,6 +146,7 @@ export default class ExportPkg extends Command {
         cmd += 'shopt -s extglob\n';
         cmd += `mkdir ${remoteMountpoint}\n`;
         cmd += `sshfs ${this.Tu.config.remoteUser}@${this.Tu.config.remoteHost}:${remotePath} ${remoteMountpoint}\n`;
+        let archDest = 'x86_64';
         if (this.clean) {
             let archDest = '';
             if (distro.familyId === 'alpine') {

package/dist/commands/export/tarballs.js

@@ -52,13 +52,13 @@ export default class ExportTarballs extends Command {
         const remoteMountpoint = `/tmp/eggs-${(Math.random() + 1).toString(36).slice(7)}`;
         const localPath = `/home/${this.user}/penguins-eggs/dist/`;
         const remotePath = `${this.Tu.config.remotePathPackages}/tarballs/`;
-        const tarNamePattern = `penguins-eggs_${pjson.version}-*-linux-x64.tar.gz`;
+        const tarNamePattern = `penguins-eggs_[0-9][0-9].[0-9]*.[0-9]*-*-linux-x64.tar.gz`;
         const searchPattern = path.join(localPath, tarNamePattern);
         const matchingFiles = globSync(searchPattern);
         if (matchingFiles.length === 0) {
             console.log(`No ${searchPattern} exists!`);
             console.log(`Create it using: pnpm tarballs`);
-            process.exit(1);
+            // process.exit(1)
         }
         let cmd = `mkdir ${remoteMountpoint}\n`;
         cmd += `sshfs ${this.Tu.config.remoteUser}@${this.Tu.config.remoteHost}:${remotePath} ${remoteMountpoint}\n`;

package/dist/commands/update.js

@@ -115,25 +115,17 @@ export default class Update extends Command {
     async getPkgFromLan() {
         const Tu = new Tools();
         await Tu.loadSettings();
-        Utils.warning('import from lan');
-        if (this.distro.familyId === "debian") {
-            const filterDeb = `penguins-eggs_10.?.*-*_${Utils.uefiArch()}.deb`;
-            const cmd = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/debs/${filterDeb} /tmp`;
-            await exec(cmd, { capture: true, echo: true });
-            if (await Utils.customConfirm(`Want to install ${filterDeb}`)) {
-                await exec(`dpkg -i /tmp/${filterDeb}`);
-            }
-        }
-        else if (this.distro.familyId === 'archlinux') {
+        Utils.warning('Update from LAN');
+        if (this.distro.familyId === 'archlinux') {
             let repo = "aur";
             if (Diversions.isManjaroBased(this.distro.distroId)) {
                 repo = 'manjaro';
             }
-            const filterAur = `penguins-eggs-10.?.*-?-any.pkg.tar.zst`;
-            const cmd = `scp ${Tu.config.remoteUser}@${Tu.config.remoteHost}:${Tu.config.remotePathPackages}/${repo}/${filterAur} /tmp`;
+            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 ${filterAur}`)) {
-                await exec(`pacman -U /tmp/${filterAur}`);
+            if (await Utils.customConfirm(`Want to install ${filter}`)) {
+                await exec(`pacman -U /tmp/${filter}`);
             }
         }
         else if (this.distro.familyId === 'alpine') {
@@ -141,13 +133,21 @@ export default class Update extends Command {
             if (process.arch === 'ia32') {
                 arch = 'i386';
             }
-            const filter = `penguins-eggs*10.?.*-r*.apk`;
+            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}`);
             }
         }
+        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}`);
+            }
+        }
     }
     /**
      *
@@ -157,13 +157,7 @@ export default class Update extends Command {
         let cmd = '';
         let url = 'https://sourceforge.net/projects/penguins-eggs/files/Packages';
         let filter = `penguins-eggs`;
-        if (this.distro.familyId === "debian") {
-            repo = "debs";
-            url = `${url}/${repo}/${Utils.uefiArch()}`;
-            filter = `penguins-eggs_10.?.*-?_${Utils.uefiArch()}.deb`;
-            cmd = `sudo dpkg -i ${filter}`;
-        }
-        else if (this.distro.familyId === 'archlinux') {
+        if (this.distro.familyId === 'archlinux') {
             repo = "aur";
             filter = `penguins-eggs-10.?.*-?-any.pkg.tar.zst`;
             cmd = `sudo pacman -U ${filter}`;
@@ -172,13 +166,27 @@ export default class Update extends Command {
             }
             url = `${url}/${repo}`;
         }
-        let command = `Open your browser at:\n`;
-        command += `${url}\n`;
-        command += `select and download the package: ${filter},\n`;
-        command += `then type the command:\n`;
-        command += `${cmd}`;
+        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 === "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);
-        await this.show(url);
+        this.show(url);
     }
     /**
    *

package/dist/penguins-eggs_25.7.30-bionic-1_amd64.deb.sha256

@@ -0,0 +1 @@
+5c928fadb433f3ea10d6da1da92c267372644f2c55eec8a02d0801dacd668c66  penguins-eggs_25.7.30-bionic-1_amd64.deb

package/package.json

@@ -2,17 +2,17 @@
   "name": "penguins-eggs",
   "shortName": "eggs",
   "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-  "version": "25.7.22",
+  "version": "25.7.30",
   "author": "Piero Proietti",
   "bin": {
     "eggs": "./bin/run.js"
   },
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
-    "@oclif/core": "^4.5.1",
-    "@oclif/plugin-autocomplete": "^3.2.32",
-    "@oclif/plugin-help": "^6.2.30",
-    "@oclif/plugin-version": "^2.2.31",
+    "@oclif/core": "^4.5.2",
+    "@oclif/plugin-autocomplete": "^3.2.34",
+    "@oclif/plugin-help": "^6.2.32",
+    "@oclif/plugin-version": "^2.2.32",
     "@types/express": "^5.0.3",
     "ansis": "^4.1.0",
     "axios": "^1.11.0",
@@ -51,12 +51,12 @@
     "@types/shelljs": "^0.8.17",
     "@types/ws": "^8.18.1",
     "chai": "^5.2.1",
-    "eslint": "^9.30.1",
-    "eslint-config-oclif": "^6.0.87",
+    "eslint": "^9.32.0",
+    "eslint-config-oclif": "^6.0.89",
     "eslint-config-prettier": "^10.1.8",
     "glob": "^11.0.3",
     "mocha": "^11.7.0",
-    "oclif": "^4.22.0",
+    "oclif": "^4.22.5",
     "perrisbrewery": "^10",
     "prettier": "^3.6.2",
     "shx": "^0.4.0",