penguins-eggs 25.9.3 → 25.9.8

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', 'Package_Manager', 'Source');
         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\nsudo apt reinstall 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 reinstall penguins-eggs';
         }
+        else if (this.distro.familyId === "openmamba") {
+            cmd = 'sudo dnf install penguins-eggs\nsudo dnf reinstall penguins-eggs';
+        }
+        else if (this.distro.familyId === "opensuse") {
+            cmd = 'sudo zypper install penguins-eggs\\zypper install --force penguins-eggs';
+        }
+        Utils.titles(`update`);
+        Utils.warning(`To install/update penguins-eggs cut and copy one of the 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 = `apt reinstall /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 --force /tmp/${filter} || 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.8-1_amd64.deb.sha256

@@ -0,0 +1 @@
+32be4d7f9678261c852de642d436ff14a8a08fac1a6c4144905a7122c924d9b1  penguins-eggs_25.9.8-1_amd64.deb

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

@@ -0,0 +1 @@
+c4b13e267b858e9c66f439ea4164d98c2fc49c06db58999123bcbec87d61f55b  penguins-eggs_25.9.8-1_arm64.deb

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

@@ -0,0 +1 @@
+c28a8df8a40a61df8b97f2d1e9ddeddf3a4986852dee0e40f221380fafde8b6a  penguins-eggs_25.9.8-1_i386.deb

package/package.json

@@ -1,134 +1,128 @@
 {
-    "name": "penguins-eggs",
-    "shortName": "eggs",
-    "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
-    "version": "25.9.3",
-    "author": "Piero Proietti",
-    "bin": {
-        "eggs": "./bin/run.js"
-    },
-    "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
-    "dependencies": {
-        "@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",
-        "chalk": "^5.6.0",
-        "cli-cursor": "^5.0.0",
-        "debug": "^4.4.1",
-        "express": "^5.1.0",
-        "ink": "^5",
-        "ink-progress-bar": "^3.0.0",
-        "ink-spinner": "^5.0.0",
-        "inquirer": "^12.9.4",
-        "js-yaml": "^4.1.0",
-        "mustache": "^4.2.0",
-        "netmask": "^2.0.2",
-        "react": "^18.3.1",
-        "read": "^4.1.0",
-        "shelljs": "^0.10.0",
-        "systeminformation": "^5.27.8",
-        "tftp": "^0.1.2",
-        "ws": "^8.18.3"
-    },
-    "devDependencies": {
-        "@oclif/prettier-config": "^0.2.1",
-        "@oclif/test": "^4.1.13",
-        "@types/chai": "^5.2.2",
-        "@types/debug": "^4.1.12",
-        "@types/glob": "^9.0.0",
-        "@types/inquirer": "^9.0.8",
-        "@types/js-yaml": "^4.0.9",
-        "@types/mocha": "^10.0.8",
-        "@types/mustache": "^4.2.6",
-        "@types/netmask": "^2.0.5",
-        "@types/node": "^22.15.30",
-        "@types/react": "^18.3.1",
-        "@types/read": "^0.0.32",
-        "@types/shelljs": "^0.8.17",
-        "@types/ws": "^8.18.1",
-        "chai": "^6.0.1",
-        "eslint": "^9.34.0",
-        "eslint-config-oclif": "^6.0.101",
-        "eslint-config-prettier": "^10.1.8",
-        "glob": "^11.0.3",
-        "mocha": "^11.7.2",
-        "oclif": "^4.22.16",
-        "perrisbrewery": "^10",
-        "prettier": "^3.6.2",
-        "shx": "^0.4.0",
-        "ts-node": "10.9.2",
-        "ts-prune": "^0.10.3",
-        "typescript": "^5.9.2"
-    },
-    "engines": {
-        "node": ">=16.0.0"
-    },
-    "files": [
-        ".oclif.manifest.json",
-        "/addons",
-        "/assets",
-        "/bin",
-        "/conf",
-        "/dist",
-        "/dracut",
-        "/eui",
-        "/maker",
-        "/manpages",
-        "/mkinitcpio",
-        "/mkinitfs",
-        "/perrisbrewery",
-        "/pods",
-        "/scripts"
+  "name": "penguins-eggs",
+  "shortName": "eggs",
+  "description": "A remaster system tool, compatible with Arch, Debian, Devuan, Ubuntu and others",
+  "version": "25.9.8",
+  "author": "Piero Proietti",
+  "bin": {
+    "eggs": "./bin/run.js"
+  },
+  "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
+  "dependencies": {
+    "@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",
+    "chalk": "^5.6.0",
+    "cli-cursor": "^5.0.0",
+    "debug": "^4.4.1",
+    "express": "^5.1.0",
+    "ink": "^5",
+    "ink-progress-bar": "^3.0.0",
+    "ink-spinner": "^5.0.0",
+    "inquirer": "^12.9.4",
+    "js-yaml": "^4.1.0",
+    "mustache": "^4.2.0",
+    "netmask": "^2.0.2",
+    "react": "^18.3.1",
+    "read": "^4.1.0",
+    "shelljs": "^0.10.0",
+    "systeminformation": "^5.27.8",
+    "tftp": "^0.1.2",
+    "ws": "^8.18.3"
+  },
+  "devDependencies": {
+    "@oclif/prettier-config": "^0.2.1",
+    "@oclif/test": "^4.1.13",
+    "@types/chai": "^5.2.2",
+    "@types/debug": "^4.1.12",
+    "@types/glob": "^9.0.0",
+    "@types/inquirer": "^9.0.8",
+    "@types/js-yaml": "^4.0.9",
+    "@types/mocha": "^10.0.8",
+    "@types/mustache": "^4.2.6",
+    "@types/netmask": "^2.0.5",
+    "@types/node": "^22.15.30",
+    "@types/react": "^18.3.1",
+    "@types/read": "^0.0.32",
+    "@types/shelljs": "^0.8.17",
+    "@types/ws": "^8.18.1",
+    "chai": "^6.0.1",
+    "eslint": "^9.35.0",
+    "eslint-config-oclif": "^6.0.102",
+    "eslint-config-prettier": "^10.1.8",
+    "glob": "^11.0.3",
+    "mocha": "^11.7.2",
+    "oclif": "^4.22.18",
+    "perrisbrewery": "^10",
+    "prettier": "^3.6.2",
+    "shx": "^0.4.0",
+    "ts-node": "10.9.2",
+    "ts-prune": "^0.10.3",
+    "typescript": "^5.9.2"
+  },
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "files": [
+    ".oclif.manifest.json",
+    "/addons",
+    "/assets",
+    "/bin",
+    "/conf",
+    "/dist",
+    "/dracut",
+    "/eui",
+    "/maker",
+    "/manpages",
+    "/mkinitcpio",
+    "/mkinitfs",
+    "/perrisbrewery",
+    "/pods",
+    "/scripts"
+  ],
+  "homepage": "https://penguins-eggs.net",
+  "keywords": [
+    "oclif",
+    "remaster",
+    "system"
+  ],
+  "license": "MIT",
+  "main": "dist/index.js",
+  "type": "module",
+  "oclif": {
+    "bin": "eggs",
+    "dirname": "penguins-eggs",
+    "commands": "./dist/commands",
+    "plugins": [
+      "@oclif/plugin-help",
+      "@oclif/plugin-autocomplete",
+      "@oclif/plugin-version"
     ],
-    "homepage": "https://penguins-eggs.net",
-    "keywords": [
-        "oclif",
-        "remaster",
-        "system"
-    ],
-    "license": "MIT",
-    "main": "dist/index.js",
-    "type": "module",
-    "oclif": {
-        "bin": "eggs",
-        "dirname": "penguins-eggs",
-        "commands": "./dist/commands",
-        "plugins": [
-            "@oclif/plugin-help",
-            "@oclif/plugin-autocomplete",
-            "@oclif/plugin-version"
-        ],
-        "topicSeparator": " ",
-        "topics": {
-            "hello": {
-                "description": "Say hello to the world and others"
-            }
-        }
-    },
-    "repository": "pieroproietti/penguins-eggs",
-    "scripts": {
-        "_postpack": "shx rm -f oclif.manifest.json",
-        "_prepack": "oclif manifest && ocl -t linux-x64",
-        "build": "shx rm -rf dist && tsc -b",
-        "deb": "shx rm -rf dist && tsc -p . && oclif manifest && pb deb --release $(cat ./release)",
-        "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
-        "lint": "eslint . --ext .ts",
-        "manifest": "oclif manifest",
-        "posttest": "pnpm run lint",
-        "tarballs": "shx rm -rf dist && tsc -p . && oclif manifest && oclif pack tarballs -t linux-x64 --no-xz -r . && pb tarballs --release $(cat ./release)",
-        "test": "mocha --forbid-only \"test/**/*.test.ts\"",
-        "unused": "ts-prune",
-        "version": "oclif readme && git add README.md"
-    },
-    "types": "dist/index.d.ts",
-    "pnpm": {
-        "overrides": {
-            "react": "^18.3.1",
-            "@types/react": "^18.3.18"
-        }
+    "topicSeparator": " ",
+    "topics": {
+      "hello": {
+        "description": "Say hello to the world and others"
+      }
     }
-}
+  },
+  "repository": "pieroproietti/penguins-eggs",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "_postpack": "shx rm -f oclif.manifest.json",
+    "_prepack": "oclif manifest && ocl -t linux-x64",
+    "build": "shx rm -rf dist && tsc -b",
+    "deb": "shx rm -rf dist && tsc -p . && oclif manifest && pb deb --release $(cat ./release)",
+    "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
+    "lint": "eslint . --ext .ts",
+    "manifest": "oclif manifest",
+    "posttest": "pnpm run lint",
+    "tarballs": "shx rm -rf dist && tsc -p . && oclif manifest && oclif pack tarballs -t linux-x64 --no-xz -r . && pb tarballs --release $(cat ./release)",
+    "test": "mocha --forbid-only \"test/**/*.test.ts\"",
+    "unused": "ts-prune",
+    "version": "oclif readme && git add README.md"
+  }
+}