penguins-eggs 9.0.9 → 9.0.16

package/README.md

@@ -113,7 +113,7 @@ $ npm install -g penguins-eggs
 $ eggs COMMAND
 running command...
 $ eggs (--version|-v)
-penguins-eggs/9.0.9 linux-x64 node-v16.13.2
+penguins-eggs/9.0.16 linux-x64 node-v16.13.2
 $ eggs --help [COMMAND]
 USAGE
   $ eggs COMMAND
@@ -124,6 +124,7 @@ USAGE
 # Commands
 <!-- commands -->
 * [`eggs adapt`](#eggs-adapt)
+* [`eggs analyze`](#eggs-analyze)
 * [`eggs autocomplete [SHELL]`](#eggs-autocomplete-shell)
 * [`eggs bro`](#eggs-bro)
 * [`eggs calamares`](#eggs-calamares)
@@ -139,6 +140,8 @@ USAGE
 * [`eggs mom`](#eggs-mom)
 * [`eggs produce`](#eggs-produce)
 * [`eggs remove`](#eggs-remove)
+* [`eggs syncfrom`](#eggs-syncfrom)
+* [`eggs syncto`](#eggs-syncto)
 * [`eggs tools clean`](#eggs-tools-clean)
 * [`eggs tools locales`](#eggs-tools-locales)
 * [`eggs tools skel`](#eggs-tools-skel)
@@ -166,7 +169,28 @@ ALIASES
   $ eggs adjust
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/adapt.ts)_
+
+## `eggs analyze`
+
+analyze situation
+
+```
+USAGE
+  $ eggs analyze [-h] [-v]
+
+FLAGS
+  -h, --help     Show CLI help.
+  -v, --verbose  verbose
+
+DESCRIPTION
+  analyze situation
+
+EXAMPLES
+  $ sudo eggs analyze
+```
+
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -195,7 +219,7 @@ EXAMPLES
   $ eggs autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.1.1/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.2.0/src/commands/autocomplete/index.ts)_
 
 ## `eggs bro`
 
@@ -212,7 +236,7 @@ DESCRIPTION
   bro: waydroid helper
 ```
 
-_See code: [src/commands/bro.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/bro.ts)_
+_See code: [src/commands/bro.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/bro.ts)_
 
 ## `eggs calamares`
 
@@ -241,7 +265,7 @@ EXAMPLES
   install calamares and create it's configuration's files
 ```
 
-_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -268,7 +292,7 @@ EXAMPLES
   Configure and install prerequisites deb packages to run it
 ```
 
-_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/config.ts)_
 
 ## `eggs dad`
 
@@ -288,7 +312,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -379,7 +403,7 @@ DESCRIPTION
   re-thinking for a different approach to CLI
 ```
 
-_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/info.ts)_
 
 ## `eggs install`
 
@@ -407,7 +431,7 @@ EXAMPLES
   Install the system using GUI or CLI installer
 ```
 
-_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/install.ts)_
 
 ## `eggs kill`
 
@@ -429,7 +453,7 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/kill.ts)_
 
 ## `eggs mom`
 
@@ -446,7 +470,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -511,7 +535,7 @@ EXAMPLES
   in /home/eggs/ovarium and you can customize all you need
 ```
 
-_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/produce.ts)_
 
 ## `eggs remove`
 
@@ -541,7 +565,59 @@ EXAMPLES
   remove eggs, eggs configurations, packages dependencies
 ```
 
-_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/remove.ts)_
+_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/remove.ts)_
+
+## `eggs syncfrom`
+
+Restore users, server and datas from luks-eggs-backup
+
+```
+USAGE
+  $ eggs syncfrom [-f <value>] [-r <value>] [-h] [-v]
+
+FLAGS
+  -f, --file=<value>     file with LUKS volume encrypted
+  -h, --help             Show CLI help.
+  -r, --rootdir=<value>  rootdir of the installed system, when used from live
+  -v, --verbose          verbose
+
+DESCRIPTION
+  Restore users, server and datas from luks-eggs-backup
+
+ALIASES
+  $ eggs restore
+
+EXAMPLES
+  $ sudo eggs restore
+```
+
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/syncfrom.ts)_
+
+## `eggs syncto`
+
+Backup users, server and datas to luks-eggs-backup
+
+```
+USAGE
+  $ eggs syncto [-k] [-f <value>] [-h] [-v]
+
+FLAGS
+  -f, --file=<value>  file LUKS volume encrypted
+  -h, --help          Show CLI help.
+  -k, --krill         krill
+  -v, --verbose       verbose
+
+DESCRIPTION
+  Backup users, server and datas to luks-eggs-backup
+
+ALIASES
+  $ eggs backup
+
+EXAMPLES
+  $ sudo eggs restore
+```
+
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -664,7 +740,7 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.9/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.0.16/src/commands/update.ts)_
 
 ## `eggs version`
 

package/addons/blissos/theme/livecd/grub.theme.cfg

@@ -6,6 +6,7 @@ title-text: "BlissOS: Android for your PC"
 # title-font: "Sans Regular 20"
 desktop-color: "blue"
 desktop-image: "splash.png"
+
 # show boot_menu
 + boot_menu {
   top = 150

package/addons/eggs/theme/calamares/branding/show.qml

@@ -57,7 +57,7 @@ Presentation
             anchors.horizontalCenter: reproductiveSystem.horizontalCenter
             anchors.top: background.top
             text: qsTr("<h1>Penguin's eggs</h1><br/>"+
-                  "<h2>The reproductive system for penguins!</h2>"+
+                  "<h2>eggs: the reproductive system of penguins!</h2>"+
                   "<h3>https://penguins-eggs.net</h3>")
             wrapMode: Text.WordWrap
             width: 800

package/addons/eggs/theme/livecd/README.md

@@ -1,23 +1,21 @@
-I'm trying to made a way to easy customize livecd boot.
+# livecd customization
 
-* grub.template.cfg
+LiveCD customization is composed of:
 * grub.theme.cfg
-* isolinux.template.cfg
 * isolinux.theme.cfg
 * splash.png
 
-# How it work
-eggs take cure to copy to fill the template with the necessary values and copy configurations on /boot/grub and /isolinux on the ISO image.
+## How it work
+eggs take cure to copy your theme configurations on /boot/grub and /isolinux on the ISO image.
 
-# grub
-You can adapt the template and the grub theme file i accord to your needs. During the production of eggs file grub.template.cfg will be convertent in grub.cfg and copied under /boot/grub directory of the image.
-* __grub.template.cfg__ -> will became -> __/boot/grub/grub.cfg__ under the iso
-* __grub.theme.cfg__
+## grub
+You can adapt the grub theme file according to your needs. During the production of eggs a grub.cfh will be geerated and copied under ```/boot/grub``` directory of the image.
+* __grub.theme.cfg__ -> will became -> __/boot/grub/theme.cfg__ under the iso
 
-# isolinux
-You can adapt the template for isolinux and the isolinux theme. During the production of eggs file isolinux.template.cfg will be convertent in isolilinux.cfg and copied under /isolinux directory of the image.
-* __isolinux.template.cfg__ -> will became -> __/isolinux/isolinux.cfg__ under the iso
-* __isolinux.theme.cfg__
 
-# splash
-both the themes will use the same splash file, who will be copied under /isolinux directory of the image.
+## isolinux
+You can adapt the isolinux theme. During the production of eggs an isolilinux.cfg will be generated and copied under ```/isolinux``` directory of the image.
+* __isolinux.theme.cfg__ -> will became -> __/isolinux/theme.cfg__ under the iso
+
+## splash
+Both isolinux and grub themes use the same splash file.

package/lib/classes/krill_install.d.ts

@@ -60,6 +60,10 @@ export default class Hatching {
     settings: Settings;
     remix: IRemix;
     distro: IDistro;
+    luksName: string;
+    luksFile: string;
+    luksDevice: string;
+    luksMountpoint: string;
     /**
      * constructor
      */
@@ -143,10 +147,6 @@ export default class Hatching {
      * syncfs
      */
     private syncfs;
-    /**
-     *
-     */
-    private restoreUsersData;
     /**
      * mkfs
      */

package/lib/classes/krill_install.js

@@ -50,6 +50,10 @@ class Hatching {
         this.settings = {};
         this.remix = {};
         this.distro = {};
+        this.luksName = '';
+        this.luksFile = '';
+        this.luksDevice = '';
+        this.luksMountpoint = '';
         this.installer = (0, installer_1.installer)();
         this.settings = new settings_1.default();
         this.language = location.language;
@@ -68,6 +72,11 @@ class Hatching {
         this.devices.swap = {};
         this.distro = new distro_1.default(this.remix);
         this.efi = fs_1.default.existsSync('/sys/firmware/efi/efivars');
+        // Per il restore dei dati
+        this.luksName = 'luks-eggs-backup';
+        this.luksFile = `/run/live/medium/live/${this.luksName}`;
+        this.luksDevice = `/dev/mapper/${this.luksName}`;
+        this.luksMountpoint = `/mnt`;
     }
     /**
      * install
@@ -128,26 +137,26 @@ class Hatching {
                 redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
             }
             // await checkIt(message)
-            message = "Syncronize filesystem ";
-            percent = 0.35;
+            /*
+            message = "Syncronize filesystem "
+            percent = 0.35
             try {
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
-                await this.syncfs();
-            }
-            catch (error) {
-                message += JSON.stringify(error);
-                redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent }));
+               redraw(<Install message={message} percent={percent} spinner={true} />)
+               await this.syncfs()
+            } catch (error) {
+               message += JSON.stringify(error)
+               redraw(<Install message={message} percent={percent} />)
             }
-            // await checkIt(message)
+            */
             /**
              * RESTORE USERS DATA
              */
-            if (fs_1.default.existsSync('/run/live/medium/live/luks-users-data')) {
-                message = "Restore users data from backup ";
+            if (fs_1.default.existsSync(this.luksFile)) {
+                message = "Restore private data from backup ";
                 percent = 0.37;
                 try {
                     redraw(react_1.default.createElement(install_1.default, { message: message, percent: percent, spinner: true }));
-                    await this.restoreUsersData();
+                    await (0, utils_2.exec)('eggs syncfrom --rootdir /tmp/calamares-krill-root/');
                 }
                 catch (error) {
                     message += JSON.stringify(error);
@@ -291,7 +300,7 @@ class Hatching {
              *
              * create user
              */
-            if (!fs_1.default.existsSync('/run/live/medium/live/luks-users-data')) {
+            if (!fs_1.default.existsSync(this.luksFile)) {
                 message = "Adding user ";
                 percent = 0.73;
                 try {
@@ -690,28 +699,6 @@ adduser ${name} \
       / ${this.installTarget}`;
         await (0, utils_2.exec)(cmd.trim());
     }
-    /**
-     *
-     */
-    async restoreUsersData() {
-        utils_1.default.warning('Opening volume luks-users-data and map it in /dev/mapper/eggs-users-data.');
-        utils_1.default.warning('You will insert the same passphrase you choose during the backup production');
-        (0, child_process_1.execSync)('sudo cryptsetup luksOpen /run/live/medium/live/luks-users-data eggs-users-data', { stdio: 'inherit' });
-        utils_1.default.warning('mounting volume eggs-users-data in /mnt');
-        (0, child_process_1.execSync)('sudo mount /dev/mapper/eggs-users-data /mnt', { stdio: 'inherit' });
-        utils_1.default.warning('removing live user in the installed system');
-        (0, child_process_1.execSync)('rm -rf /tmp/calamares-krill-root/home/*', { stdio: 'inherit' });
-        utils_1.default.warning('copying users home in the installed system');
-        (0, child_process_1.execSync)('rsync -a /mnt/home/ /tmp/calamares-krill-root/home/', { stdio: 'inherit' });
-        utils_1.default.warning('copying users accounts in the installed system');
-        (0, child_process_1.execSync)('cp /mnt/etc/passwd /tmp/calamares-krill-root/etc/', { stdio: 'inherit' });
-        (0, child_process_1.execSync)('cp /mnt/etc/shadow /tmp/calamares-krill-root/etc/', { stdio: 'inherit' });
-        (0, child_process_1.execSync)('cp /mnt/etc/group /tmp/calamares-krill-root/etc/', { stdio: 'inherit' });
-        utils_1.default.warning('unmount /mnt');
-        (0, child_process_1.execSync)('umount /mnt', { stdio: 'inherit' });
-        utils_1.default.warning('closing eggs-users-data');
-        (0, child_process_1.execSync)('cryptsetup luksClose eggs-users-data', { stdio: 'inherit' });
-    }
     /**
      * mkfs
      */

package/lib/classes/krill_prepare.js

@@ -135,12 +135,12 @@ class Krill {
     async partitions(crypted = false) {
         let installationDevice = '/dev/sda';
         let installationMode = 'standard';
+        if (crypted) {
+            installationMode = 'full-encrypted';
+        }
         let luksPassphrase = 'evolution';
         let filesystemType = 'ext4';
         let userSwapChoice = 'small';
-        if (crypted = true) {
-            installationMode = 'full-encrypted';
-        }
         let partitionsElem;
         while (true) {
             partitionsElem = react_1.default.createElement(partitions_1.default, { installationDevice: installationDevice, installationMode: installationMode, luksPassphrase: luksPassphrase, filesystemType: filesystemType, userSwapChoice: userSwapChoice });
@@ -149,7 +149,8 @@ class Krill {
             }
             else {
                 installationDevice = '';
-                if (crypted = true) {
+                installationMode = 'standard';
+                if (crypted) {
                     installationMode = 'full-encrypted';
                 }
                 luksPassphrase = 'evolution';

package/lib/classes/ovary.d.ts

@@ -1,6 +1,7 @@
 import { IMyAddons } from '../interfaces';
 import Incubator from './incubation/incubator';
 import Settings from './settings';
+import Users from './users';
 /**
  * Ovary:
  */
@@ -88,10 +89,6 @@ export default class Ovary {
      * - normal solo la creazione della directory, nessun mount
      * - merged creazione della directory e mount ro
      * - mergedAndOverlay creazione directory, overlay e mount rw
-     *
-     * @param dir
-     *
-     * @returns merged
      */
     merged(dir: string): boolean;
     /**
@@ -115,16 +112,6 @@ export default class Ovary {
      * @param verbose
      */
     ubindVfs(verbose?: boolean): Promise<void>;
-    /**
-     *
-     * @param verbose
-     */
-    getUsersDatasSize(verbose?: boolean): Promise<number>;
-    /**
-     *
-     * @param verbose
-     */
-    copyUsersDatas(verbose?: boolean): Promise<void>;
     /**
      *
      * @param verbose
@@ -178,4 +165,8 @@ export default class Ovary {
      * @param scriptOnly
      */
     finished(scriptOnly?: boolean): void;
+    /**
+    * fill
+    */
+    usersFill(): Promise<Users[]>;
 }