penguins-eggs 9.2.5 → 9.2.9

package/{lib → dist}/krill/modules/partition.js

@@ -13,8 +13,7 @@ const tslib_1 = require("tslib");
 const utils_1 = require("../../lib/utils");
 const utils_2 = tslib_1.__importDefault(require("../../classes/utils"));
 const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
-// import React from 'react';
-// import { render, RenderOptions } from 'ink'
+const os_1 = tslib_1.__importDefault(require("os"));
 /**
  *
  * @param this
@@ -33,6 +32,18 @@ async function partition() {
         p = 'p';
     }
     const installMode = this.partitions.installationMode;
+    let swapSize = Math.round(os_1.default.totalmem() / 1073741824) * 1024;
+    if (this.partitions.userSwapChoice === 'none') {
+        swapSize = 256;
+    }
+    else if (this.partitions.userSwapChoice === 'small') {
+    }
+    else if (this.partitions.userSwapChoice === 'suspend') {
+        swapSize *= 2;
+    }
+    else if (this.partitions.userSwapChoice === 'file') {
+        swapSize = 0;
+    }
     if (installMode === 'standard' && !this.efi) {
         /**
          * ===========================================================================================
@@ -40,8 +51,8 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel msdos`, this.echo);
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap    1MiB     8192MiB`, this.echo); //dev/sda1 swap
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4       8192MiB     100%`, this.echo); //dev/sda2 root
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap       1MiB    ${swapSize + 1}MiB`, this.echo); //dev/sda1 swap
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4 ${swapSize + 1}MiB                100%`, this.echo); //dev/sda2 root
         await (0, utils_1.exec)(`parted ${installDevice} set 1 boot on`, this.echo);
         await (0, utils_1.exec)(`parted ${installDevice} set 1 esp on`, this.echo);
         // SWAP
@@ -65,9 +76,9 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel msdos`, this.echo);
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4          1MiB   512MiB`, this.echo); // sda1
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap  512MiB  8704MiB`, this.echo); // sda2
-        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4       8704MiB     100%`, this.echo); // sda3
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4         1MiB        512MiB`, this.echo); // sda1
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary linux-swap 512MiB        ${swapSize + 512}MiB`, this.echo); // sda2
+        await (0, utils_1.exec)(`parted --script --align optimal ${installDevice} mkpart primary ext4 ${swapSize + 512}MiB                100%`, this.echo); // sda3
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 boot on`, this.echo); // sda1
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 esp on`, this.echo); // sda1
         // BOOT 512M
@@ -120,9 +131,9 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel gpt`, this.echo);
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi  fat32         34s   256MiB`, this.echo); // sda1 EFI
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap 768MiB  8960MiB`, this.echo); // sda2 swap
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4      8960MiB     100%`, this.echo); // sda3 root
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi  fat32      34s                256MiB`, this.echo); // sda1 EFI
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap 256MiB ${swapSize + 256}Mib`, this.echo); // sda2 swap
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4 ${swapSize + 256}MiB         100%`, this.echo); // sda3 root
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 boot on`, this.echo); // sda1
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 esp on`, this.echo); // sda1
         this.devices.efi.name = `${installDevice}${p}1`;
@@ -147,10 +158,10 @@ async function partition() {
          * ===========================================================================================
          */
         await (0, utils_1.exec)(`parted --script ${installDevice} mklabel gpt`, this.echo);
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi fat32           34s   256MiB`, this.echo); // sda1 EFI
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart boot ext4        256MiB   768MiB`, this.echo); // sda2 boot
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap  768MiB  8960MiB`, this.echo); // sda3 swap
-        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4       8960MiB     100%`, this.echo); // sda4 root
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart efi fat32               34s               256MiB`, this.echo); // sda1 EFI
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart boot ext4             256MiB              768MiB`, this.echo); // sda2 boot
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart swap linux-swap       768MiB  ${swapSize + 768}MiB`, this.echo); // sda3 swap
+        await (0, utils_1.exec)(`parted --script ${installDevice} mkpart root ext4 ${swapSize + 768}MiB                100%`, this.echo); // sda4 root
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 boot on`, this.echo); // sda1
         await (0, utils_1.exec)(`parted --script ${installDevice} set 1 esp on`, this.echo); // sda1
         // EFI 256M

package/{lib → dist}/lib/cli-autologin.js

@@ -110,7 +110,7 @@ exports.remove = remove;
  */
 async function addMotd(distro, version, user, userPasswd, rootPasswd, chroot = '/') {
     const fileMotd = `${chroot}/etc/motd`;
-    let installer = 'sudo eggs krill';
+    let installer = 'sudo eggs install';
     if (pacman_1.default.packageIsInstalled('calamares')) {
         if (pacman_1.default.packageIsInstalled('plasma-desktop')) {
             installer = 'startplasma-wayland to run GUI and launch calamares, or from terminal sudo eggs krill -c';

package/{lib → dist}/lib/utils.js

@@ -33,7 +33,6 @@ async function exec(command, { echo = false, ignore = false, capture = false } =
      * That should play nicely with oclif/core.
      */
     return new Promise((resolve, reject) => {
-        var _a;
         if (echo) {
             console.log(command);
         }
@@ -44,7 +43,7 @@ async function exec(command, { echo = false, ignore = false, capture = false } =
         // child.stdout.on('data', (data: string) => {
         let stdout = '';
         if (capture) {
-            (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+            child.stdout?.on('data', (data) => {
                 stdout += data;
             });
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.2.5",
+  "version": "9.2.9",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"
@@ -9,13 +9,13 @@
   "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
   "dependencies": {
     "@oclif/core": "^1",
-    "@oclif/plugin-autocomplete": "1.3.0",
+    "@oclif/plugin-autocomplete": "1.3.2",
     "@oclif/plugin-help": "^5.1.12",
     "@oclif/plugin-not-found": "^2.3.1",
     "@oclif/plugin-version": "^1.1.1",
     "@oclif/plugin-warn-if-update-available": "^2.0.4",
     "@oclif/test": "^2.1.0",
-    "axios": "^0.27.2",
+    "axios": "^1.1.2",
     "chalk": "^4.1.2",
     "ink": "^3.2.0",
     "ink-big-text": "^1.2.0",
@@ -25,17 +25,22 @@
     "mustache": "^4.2.0",
     "netmask": "^2.0.2",
     "node-static": "^0.7.11",
+    "penguins-oclif": "^9.1.37",
     "react": "^17.0.2",
     "shelljs": "0.8.5",
-    "tslib": "^2.4.0"
+    "tftp": "^0.1.2",
+    "tslib": "^2.4.0",
+    "typescript": "^4.7.4"
   },
   "devDependencies": {
+    "@tsconfig/recommended": "^1.0.1",
     "@types/chai": "^4.3.1",
+    "@types/ini": "^1.3.31",
     "@types/ink-big-text": "^1.2.1",
     "@types/ink-gradient": "^2.0.1",
-    "@types/inquirer": "^8.2.1",
+    "@types/inquirer": "^9.0.2",
     "@types/js-yaml": "^4.0.5",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.0",
     "@types/mustache": "^4.1.3",
     "@types/netmask": "^1.0.30",
     "@types/node": "^18.6.3",
@@ -44,33 +49,32 @@
     "@types/shelljs": "^0.8.11",
     "@typescript-eslint/parser": "^5.27.1",
     "chai": "^4.3.6",
-    "eslint": "^7.32.0",
+    "eslint": "^7",
     "eslint-config-oclif": "^4.0.0",
     "eslint-config-oclif-typescript": "^1.0.2",
     "globby": "^11",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
-    "penguins-oclif": "^9.1.37",
     "perrisbrewery": "^9.1.37",
     "ts-node": "^10.8.1",
-    "typedoc": "^0.23.10",
-    "typescript": "^4.7.4"
+    "typedoc": "^0.23.10"
   },
   "peerDependencies": {
     "@typescript-eslint/parser": "^5.0.0",
-    "@typescript-eslint/plugin": "^5.0.0",
-    "typescript": "^4.6.0"
+    "@typescript-eslint/plugin": "^5.0.0"
   },
   "dirname": "eggs",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "files": [
+    ".oclif.manifest.json",
     "/addons",
     "/assets",
     "/bin",
     "/conf",
-    "/lib",
+    "/dist",
+    "/ipxe",
     "/manpages",
     "mkinitcpio",
     "/scripts"
@@ -83,10 +87,10 @@
     "systemback"
   ],
   "license": "MIT",
-  "main": "./lib/index.js",
+  "main": "./dist/index.js",
   "oclif": {
     "bin": "eggs",
-    "commands": "./lib/commands",
+    "commands": "./dist/commands",
     "plugins": [
       "@oclif/plugin-autocomplete",
       "@oclif/plugin-help",
@@ -104,7 +108,6 @@
   },
   "repository": "https://github.com/pieroproietti/penguins-eggs",
   "shortName": "eggs",
-  "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc -p .",
     "deb": "oclif pack:deb && pb deb ./",

package/scripts/_eggs

@@ -11,7 +11,7 @@ _eggs () {
 "analyze:analyze for syncto"
 "calamares:calamares or install or configure it"
 "config:Configure and install prerequisites deb packages to run it"
-"cuckoo:cuckoo start a PXE boot server serving the live image"
+"cuckoo:PXE start with proxy-dhcp"
 "dad:ask help from daddy - configuration helper"
 "export\:deb:export deb/docs/iso to the destination host"
 "export\:docs:remove and export docType documentation of the sources in the destination host"
@@ -76,9 +76,7 @@ config)
 
 cuckoo)
   _command_flags=(
-    "--real[start a real dhcp server]"
-"--help[Show CLI help.]"
-"--verbose[verbose]"
+    "--from=-[Who is saying hello]:"
   )
 ;;
 
@@ -119,11 +117,17 @@ export:iso)
 
 install)
   _command_flags=(
-    "--unattended[unattended CLI installation]"
-"--crypted[crypted CLI installation]"
+    "--unattended[Unattended installation]"
+"--ip[hostname as ip, eg: ip-192-168-1-33]"
+"--random[Add random to hostname, eg: colibri-ay412dt]"
+"--domain=-[Domain name, defult: .local]:"
+"--suspend[Swap suspend: RAM x 2]"
+"--small[Swap small: RAM]"
+"--none[Swap none: 256M]"
+"--crypted[Crypted CLI installation]"
 "--pve[Proxmox VE install]"
 "--help[Show CLI help.]"
-"--verbose[verbose]"
+"--verbose[Verbose]"
   )
 ;;
 

package/scripts/eggs.bash

@@ -15,12 +15,12 @@ adapt --verbose --help
 analyze --help --verbose
 calamares --help --verbose --install --release --remove --theme
 config --nointeractive --clean --help --verbose
-cuckoo --real --help --verbose
+cuckoo --from
 dad --help --clean --default --verbose
 export:deb --help --clean --amd64 --i386 --armel --arm64 --all
 export:docs --help
 export:iso --help --backup --clean
-install --unattended --crypted --pve --help --verbose
+install --unattended --ip --random --domain --suspend --small --none --crypted --pve --help --verbose
 kill --help --verbose
 mom --help
 produce --prefix --basename --backup --clone --fast --normal --max --verbose --yolk --script --help --theme --addons --release

package/lib/classes/bleach.d.ts

@@ -1,40 +0,0 @@
-/**
- * penguins-eggs: Bleach.ts
- *
- * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- */
-/**
- * Bleach:
- */
-export default class Bleach {
-    /**
-     * clean
-     * @param verbose
-     */
-    clean(verbose?: boolean): Promise<void>;
-    /**
-     * cleanApt
-     * @param verbose
-     */
-    private cleanApt;
-    /**
-     * cleanHistory
-     * @param verbose
-     */
-    private cleanHistory;
-    /**
-     * cleanJournal
-     * @param verbose
-     */
-    private cleanJournal;
-    /**
-     * cleanSystemCache
-     * @param verbose
-     */
-    private cleanSystemCache;
-}
-/**
- * Elenco pulitori bleachbit
- * Solo quelli pertinenti root
- */

package/lib/classes/compressors.d.ts

@@ -1,24 +0,0 @@
-export default class Compressors {
-    isEnabled: {
-        error: boolean;
-        gzip: boolean;
-        lzma: boolean;
-        lzo: boolean;
-        lz4: boolean;
-        xz: boolean;
-        zstd: boolean;
-    };
-    source: string;
-    dest: string;
-    populate(): Promise<void>;
-    fast(): string;
-    normal(): string;
-    /**
-     * max
-     * @returns
-     */
-    max(): string;
-    private prepareCheck;
-    private removeCheck;
-    private check;
-}

package/lib/classes/daddy.d.ts

@@ -1,11 +0,0 @@
-import Settings from '../classes/settings';
-import { IEggsConfig } from '../interfaces';
-export default class Daddy {
-    settings: Settings;
-    helpMe(loadDefault?: boolean, verbose?: boolean): Promise<void>;
-    /**
-     *
-     * @param c
-     */
-    editConfig(c: IEggsConfig): Promise<string>;
-}

package/lib/classes/distro.d.ts

@@ -1,31 +0,0 @@
-/**
- * penguins-eggs: Distro.ts
- *
- * author: Piero Proietti
- * mail: piero.proietti@gmail.com
- */
-import { IRemix, IDistro } from '../interfaces';
-/**
- * Classe
- */
-declare class Distro implements IDistro {
-    familyId: string;
-    distroId: string;
-    distroLike: string;
-    codenameId: string;
-    codenameLikeId: string;
-    releaseId: string;
-    releaseLike: string;
-    usrLibPath: string;
-    isolinuxPath: string;
-    syslinuxPath: string;
-    pxelinuxPath: string;
-    liveMediumPath: string;
-    mountpointSquashFs: string;
-    homeUrl: string;
-    supportUrl: string;
-    bugReportUrl: string;
-    isCalamaresAvailable: boolean;
-    constructor(remix?: IRemix);
-}
-export default Distro;

package/lib/classes/family/archlinux.d.ts

@@ -1,69 +0,0 @@
-/**
- * penguins-eggs-v8
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-/**
- * Utils: general porpourse utils
- * @remarks all the utilities
- */
-export default class Archlinux {
-    static packs4calamares: string[];
-    /**
-     * check if it's installed xorg
-     * @returns true if xorg is installed
-     */
-    static isInstalledXorg(): boolean;
-    /**
-     * check if it's installed wayland
-     * @returns true if wayland
-     */
-    static isInstalledWayland(): boolean;
-    /**
-     * Crea array pacchetti da installare/rimuovere
-     */
-    static packages(remove?: boolean, verbose?: boolean): string[];
-    /**
-     *
-     */
-    static prerequisitesInstall(verbose?: boolean): Promise<boolean>;
-    /**
-     * Torna verso se calamares è installato
-     */
-    static calamaresCheck(): Promise<boolean>;
-    /**
-     *
-     */
-    static calamaresInstall(verbose?: boolean): Promise<void>;
-    /**
-     * calamaresPolicies
-     */
-    static calamaresPolicies(): Promise<void>;
-    /**
-     *
-     */
-    static calamaresRemove(verbose?: boolean): Promise<boolean>;
-    /**
-     * restuisce VERO se il pacchetto è installato
-     * @param packageName
-     */
-    static packageIsInstalled(packageName: string): boolean;
-    /**
-     * Install the package packageName
-     * @param packageName {string} Pacchetto Debian da installare
-     * @returns {boolean} True if success
-     */
-    static packageInstall(packageName: string): Promise<boolean>;
-    /**
-     * restuisce VERO se il pacchetto è installato
-     * @param packageName
-     */
-    static packageAptAvailable(packageName: string): Promise<boolean>;
-    /**
-     *
-     * @param packageName
-     * @returns
-     */
-    static packageAptLast(packageName: string): Promise<string>;
-}

package/lib/classes/family/debian.d.ts

@@ -1,68 +0,0 @@
-/**
- * penguins-eggs-v8
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-/**
- * Utils: general porpourse utils
- * @remarks all the utilities
- */
-export default class Debian {
-    static debs4calamares: string[];
-    /**
-     * check if it's installed xorg
-     * @returns true if xorg is installed
-     */
-    static isInstalledXorg(): boolean;
-    /**
-     * check if it's installed wayland
-     * @returns true if wayland
-     */
-    static isInstalledWayland(): boolean;
-    /**
-     * Crea array packages dei pacchetti da installare
-     */
-    static packages(remove?: boolean, verbose?: boolean): string[];
-    /**
-     *
-     */
-    static prerequisitesInstall(verbose?: boolean): Promise<boolean>;
-    /**
-     * Torna verso se calamares è installato
-     */
-    static calamaresCheck(): Promise<boolean>;
-    /**
-     *
-     */
-    static liveInstallerPolicies(): Promise<void>;
-    /**
-     *
-     */
-    static calamaresInstall(verbose?: boolean): Promise<void>;
-    /**
-     * calamaresPolicies
-     */
-    static calamaresPolicies(): Promise<void>;
-    /**
-     *
-     */
-    static calamaresRemove(verbose?: boolean): Promise<boolean>;
-    /**
-     * restuisce VERO se il pacchetto è installato
-     * @param debPackage
-     */
-    static packageIsInstalled(debPackage: string): boolean;
-    /**
-     * Install the package packageName
-     * @param packageName {string} Pacchetto Debian da installare
-     * @returns {boolean} True if success
-     */
-    static packageInstall(packageName: string): Promise<boolean>;
-    /**
-     * restuisce VERO se il pacchetto è installato
-     * @param debPackage
-     */
-    static packageAptAvailable(packageName: string): Promise<boolean>;
-    static packageAptLast(debPackage: string): Promise<string>;
-}

package/lib/classes/family/fedora.d.ts

@@ -1,63 +0,0 @@
-/**
- * penguins-eggs-v8
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
- */
-/**
- * Utils: general porpourse utils
- * @remarks all the utilities
- */
-export default class Fedora {
-    static packs4calamares: string[];
-    /**
-     * check if it's installed xorg
-     * @returns true if xorg is installed
-     */
-    static isInstalledXorg(): boolean;
-    /**
-     * check if it's installed wayland
-     * @returns true if wayland
-     */
-    static isInstalledWayland(): boolean;
-    /**
-     * Crea array pacchetti da installare/rimuovere
-     */
-    static packages(remove?: boolean, verbose?: boolean): string[];
-    /**
-     *
-     */
-    static prerequisitesInstall(verbose?: boolean): Promise<boolean>;
-    /**
-     * Torna verso se calamares è installato
-     */
-    static calamaresCheck(): Promise<boolean>;
-    /**
-     *
-     */
-    static calamaresInstall(verbose?: boolean): Promise<void>;
-    /**
-     * calamaresPolicies
-     */
-    static calamaresPolicies(): Promise<void>;
-    /**
-     *
-     */
-    static calamaresRemove(verbose?: boolean): Promise<boolean>;
-    /**
-     * restuisce VERO se il pacchetto è installato
-     * @param packageName
-     */
-    static packageIsInstalled(packageName: string): boolean;
-    /**
-     * Install the package packageName
-     * @param packageName {string} Pacchetto da installare
-     * @returns {boolean} True if success
-     */
-    static packageInstall(packageName: string): Promise<boolean>;
-    /**
-     * restuisce VERO se il pacchetto è installato
-     * @param packageName
-     */
-    static packageAvailable(packageName: string): Promise<boolean>;
-}