penguins-eggs 9.1.34 → 9.1.35

package/README.md

@@ -132,7 +132,7 @@ $ npm install -g penguins-eggs
 $ eggs COMMAND
 running command...
 $ eggs (--version|-v)
-penguins-eggs/9.1.34 linux-x64 node-v16.15.1
+penguins-eggs/9.1.35 linux-x64 node-v16.15.1
 $ eggs --help [COMMAND]
 USAGE
   $ eggs COMMAND
@@ -189,7 +189,7 @@ DESCRIPTION
   adapt monitor resolution for VM only
 ```
 
-_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/adapt.ts)_
+_See code: [src/commands/adapt.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/adapt.ts)_
 
 ## `eggs analyze`
 
@@ -210,7 +210,7 @@ EXAMPLES
   $ sudo eggs analyze
 ```
 
-_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/analyze.ts)_
+_See code: [src/commands/analyze.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/analyze.ts)_
 
 ## `eggs autocomplete [SHELL]`
 
@@ -268,7 +268,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.1.34/src/commands/calamares.ts)_
+_See code: [src/commands/calamares.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/calamares.ts)_
 
 ## `eggs config`
 
@@ -292,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.1.34/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/config.ts)_
 
 ## `eggs dad`
 
@@ -312,7 +312,7 @@ DESCRIPTION
   ask help from daddy - configuration helper
 ```
 
-_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/dad.ts)_
+_See code: [src/commands/dad.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/dad.ts)_
 
 ## `eggs export deb`
 
@@ -403,7 +403,7 @@ DESCRIPTION
   informations about eggs configuration
 ```
 
-_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/info.ts)_
 
 ## `eggs install`
 
@@ -451,7 +451,7 @@ EXAMPLES
   kill the eggs/free the nest
 ```
 
-_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/kill.ts)_
+_See code: [src/commands/kill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/kill.ts)_
 
 ## `eggs krill`
 
@@ -479,7 +479,7 @@ EXAMPLES
   Install the system using GUI or CLI installer
 ```
 
-_See code: [src/commands/krill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/krill.ts)_
+_See code: [src/commands/krill.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/krill.ts)_
 
 ## `eggs mom`
 
@@ -496,7 +496,7 @@ DESCRIPTION
   ask for mommy - gui helper
 ```
 
-_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/mom.ts)_
+_See code: [src/commands/mom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/mom.ts)_
 
 ## `eggs produce`
 
@@ -557,7 +557,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.1.34/src/commands/produce.ts)_
+_See code: [src/commands/produce.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/produce.ts)_
 
 ## `eggs remove`
 
@@ -587,7 +587,7 @@ EXAMPLES
   remove eggs, eggs configurations, packages dependencies
 ```
 
-_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/remove.ts)_
+_See code: [src/commands/remove.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/remove.ts)_
 
 ## `eggs syncfrom`
 
@@ -611,7 +611,7 @@ EXAMPLES
   $ sudo eggs restore
 ```
 
-_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/syncfrom.ts)_
+_See code: [src/commands/syncfrom.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/syncfrom.ts)_
 
 ## `eggs syncto`
 
@@ -634,7 +634,7 @@ EXAMPLES
   $ sudo eggs syncto
 ```
 
-_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/syncto.ts)_
+_See code: [src/commands/syncto.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/syncto.ts)_
 
 ## `eggs tools clean`
 
@@ -729,7 +729,7 @@ EXAMPLES
   update/upgrade the penguin's eggs tool
 ```
 
-_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.34/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/pieroproietti/penguins-eggs/blob/v9.1.35/src/commands/update.ts)_
 
 ## `eggs version`
 

package/addons/eggs/theme/applications/install-debian.desktop

@@ -4,8 +4,8 @@ Version=1.0
 Name=Install System
 GenericName=System Installer
 Keywords=calamares;system;installer;
-Exec=pkexec calamares
-# Exec=pkexec /usr/bin/calamares
+Exec=sh -c "pkexec /usr/bin/calamares"
+# Exec=pkexec calamares
 TryExec=calamares
 Comment=Calamares — System Installer
 Icon=install-debian

package/conf/exclude.list

@@ -1,107 +1,92 @@
-# rsync excludes file for penguins-eggs
-# version 7.5.53
+# rsync excludes file for refractasnapshot and refractasnapshot-gui
+# version 9.3.4
 
-# Do NOT edit this entry block unless you know what you are doing
+# Exclude some system files. These are required, and you probably 
+# shouldn't change them.
 
-# root 
-cdrom/*
-dev/*
-#live/*
-lost+found
-media/*
-mnt/*
-proc/*
-run/*
-sys/*
-tmp/*
-swapfile
+- /dev/*
+- /cdrom/*
+- /media/*
+- /swapfile
+- /mnt/*
+- /sys/*
+- /proc/*
+- /tmp/*
+- /live
+- /persistence.conf
 
 # boot
-boot/efi/
-# Toglie tutto ad eccezione di themes ed i fonts
-boot/grub/!(themes|fonts)
-
-## Questi vengono esclusi anche da ovary
-## "/boot/efi/EFI", "/etc/fstab", "/etc/mtab", "/etc/udev/rules.d/70-persistent-cd.rules", "/etc/udev/rules.d/70-persistent-net.rules"]
+- /boot/grub/grub.cfg
+- /boot/grub/menu.lst
+- /boot/grub/device.map
+- /boot/*.bak
+- /boot/*.old-dkms
+- /etc/udev/rules.d/70-persistent-cd.rules
+- /etc/udev/rules.d/70-persistent-net.rules
 
 # etc
-etc/adjtime
-etc/bcm-ckd
-etc/blkid.tab.old
-etc/defaultdomain
-etc/crypttab
-etc/fstab
-etc/fstab.backup
-etc/ioctl.save
-# https://github.com/pieroproietti/penguins-eggs/issues/125 
-# added follow line to exclude
-etc/initramfs-tools/conf.d/resume
-etc/live/protect
-etc/machine-id
-etc/mailname
-etc/mtab
-etc/NetworkManager/system-connections/*
-etc/pve/*
-etc/udev/rules.d/70-persistent-cd.rules
-etc/udev/rules.d/70-persistent-net.rules
-#etc/resolv.conf
-
-# /root
-root/.bash_history
-root/.dbus
-root/.gconf
-root/.gnome2
-root/keyfile
-
-# var
-# var/cache
-var/cache/apt/archives/*.deb
-var/cache/apt-xapian-index/index.*
-var/cache/apt-show-versions/*
-var/cache/apt/*.bin
-var/cache/apt/apt-file/*
-var/cache/debconf/*-old
-var/cache/lightdm
-var/cache/samba/browse.dat
+- /etc/apt/sources.list~
+- /etc/mtab
+- /etc/blkid.tab
+- /etc/blkid.tab.old
+- /etc/crypttab
+- /etc/fstab
+- /etc/fstab.d/*
+- /etc/initramfs-tools/conf.d/resume     # see remove-cryptroot and nocrypt.sh
+- /etc/initramfs-tools/conf.d/cryptroot  # see remove-cryptroot and nocrypt.sh
+- /etc/machine-id
+- /etc/popularity-contest.conf
+- /etc/ssh/ssh_host_*_key*
+- /etc/ssh/ssh_host_key*
 
-# var/lib
-var/lib/apt/lists/*
-var/lib/connman/*
-var/lib/dbus/machine-id
-var/lib/dhcp/*
-var/lib/dpkg/*-old
-var/lib/lightdm/.cache
-var/lib/lightdm/.Xauthority
-var/lib/NetworkManager/*
-var/lib/nfs/rpc_pipefs/*
-var/lib/sudo/*
-var/lib/udisks/*
-var/lib/urandom/*
+# Added for newer version of live-config/live-boot in wheezy 
+# These are only relevant here if you create a snapshot while
+# you're running a live-CD or live-usb. 
+- /lib/live/overlay
+- /lib/live/image
+- /lib/live/rootfs
+- /lib/live/mount
+- /run/*
 
-# var/log: 
-# remove all with exception of:
-# apache2, clamav, pveprozy, samba, mysql, cga-update-manager
-var/log/!(apache2|clamav|pveproxy|samba|mysql|cga-update-manager)
+# eggs remove all under home
+- /home/*
 
-# the follow lines remove all inside ther respective dirs:
-var/log/apache2/*
-var/log/clamav/*
-var/log/pveproxy/*
-var/log/samba/*
-var/log/mysql/*
-
-# We don't want remove nothing in /var/log/cga-update-manager
-#var/log/cga-update-manager
-
-
-var/mail/*
-var/spool/mail/*
-var/tmp/*
-var/cache/brightness-settings-cache/*
+# /root
+- /root/.aptitude
+- /root/.bash_history
+- /root/.disk-manager.conf
+- /root/.fstab.log
+- /root/.lesshst
+- /root/*/.log
+- /root/.local/share/*
+- /root/.nano_history
+- /root/.synaptic
+- /root/.VirtualBox
+- /root/.ICEauthority
+- /root/.Xauthority
+- /root/.ssh
 
-# deepin
-data/*
-recovery/*
+# Added for symlink /lib
+- /usr/lib/live/overlay
+- /usr/lib/live/image
+- /usr/lib/live/rootfs
+- /usr/lib/live/mount
 
-# archlinux
-var/cache/pacman/pkg/*
+# var
+- /var/cache/apt/archives/*.deb
+- /var/cache/apt/pkgcache.bin
+- /var/cache/apt/srcpkgcache.bin
+- /var/cache/apt/apt-file/*
+- /var/cache/debconf/*~old
+- /var/lib/apt/lists/*
+- /var/lib/apt/*~
+- /var/lib/apt/cdroms.list
+- /var/lib/aptitude/*.old
+- /var/lib/dhcp/*
+- /var/lib/dpkg/*~old
+- /var/spool/mail/*
+- /var/mail/*
+- /var/backups/*.gz
+- /var/lib/dbus/machine-id
+- /var/lib/live/config/*
+- /usr/share/icons/*/icon-theme.cache

package/lib/classes/distro.js

@@ -203,6 +203,12 @@ class Distro {
                 this.codenameLikeId = 'bookworm';
                 break;
             }
+            case `hera`: {
+                // Elementary
+                this.distroLike = 'Ubuntu';
+                this.codenameLikeId = 'bionic';
+                break;
+            }
             case `jolnir`: {
                 // Elementary
                 this.distroLike = 'Ubuntu';

package/lib/classes/ovary.js

@@ -615,7 +615,13 @@ class Ovary {
         /**
          * exclude all the accurence of cryptdisks in rc0.d, etc
          */
-        let fexcludes = ["/boot/efi/EFI", "/etc/fstab", "/etc/mtab", "/etc/udev/rules.d/70-persistent-cd.rules", "/etc/udev/rules.d/70-persistent-net.rules"];
+        let fexcludes = [
+            "/boot/efi/EFI",
+            "/etc/fstab",
+            "/etc/mtab",
+            "/etc/udev/rules.d/70-persistent-cd.rules",
+            "/etc/udev/rules.d/70-persistent-net.rules"
+        ];
         for (let i in fexcludes) {
             this.addRemoveExclusion(true, fexcludes[i]);
         }
@@ -642,6 +648,7 @@ class Ovary {
             fs_1.default.unlinkSync(`${this.settings.work_dir.pathIso}/live/filesystem.squashfs`);
         }
         const compression = `-comp ${this.settings.config.compression}`;
+        // let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`
         let cmd = `mksquashfs ${this.settings.work_dir.merged} ${this.settings.work_dir.pathIso}live/filesystem.squashfs ${compression} -wildcards -ef ${this.settings.config.snapshot_excludes} ${this.settings.session_excludes}`;
         cmd = cmd.replace(/\s\s+/g, ' ');
         utils_2.default.writeX(`${this.settings.work_dir.path}mksquashfs`, cmd);
@@ -1081,7 +1088,7 @@ class Ovary {
      */
     addRemoveExclusion(add, exclusion) {
         if (exclusion.startsWith('/')) {
-            exclusion = exclusion.slice(1); // remove / initial Non compatible with
+            exclusion = exclusion.slice(1); // remove / initial Non compatible with rsync
         }
         if (add) {
             this.settings.session_excludes += this.settings.session_excludes === '' ? `-e '${exclusion}' ` : ` '${exclusion}' `;

package/lib/components/elements/information.js

@@ -89,8 +89,6 @@ async function information(verbose = false) {
                     react_1.default.createElement(ink_1.Text, { color: "cyan" },
                         settings.distro.distroLike,
                         " ",
-                        settings.distro.releaseLike,
-                        " ",
                         settings.distro.codenameLikeId))))));
     // render(<Distro />)
     const dependencies = await pacman_1.default.prerequisitesCheck();

package/lib/krill/modules/set-keyboard.js

@@ -16,7 +16,7 @@ async function setKeyboard() {
     *          /etc/vconsole.conf is update in installed syste,
     */
     // systemd as default
-    let cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout} ${this.toNull}`;
+    let cmd = `chroot ${this.installTarget} localectl set-keymap ${this.keyboardLayout}`;
     if (!utils_1.default.isSystemd()) {
         cmd = `chroot ${this.installTarget} setupcon ${this.toNull}`;
     }
@@ -41,10 +41,10 @@ async function setKeyboard() {
     content += 'XKBOPTIONS=""\n';
     content += '\n';
     content += 'BACKSPACE="guess"\n';
-    utils_1.default.write(this.installTarget + '/etc/default/keyboard', content);
+    // Utils.write(this.installTarget + '/etc/default/keyboard', content)
     content = 'KEYMAP=' + +this.keyboardModel + '"\n';
     content += 'FONT=\n';
     content += 'FONT_MAP=\n';
-    utils_1.default.write(this.installTarget + '/etc/vconsole.conf', content);
+    // Utils.write(this.installTarget + '/etc/vconsole.conf', content)
 }
 exports.default = setKeyboard;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "penguins-eggs",
   "description": "Perri's Brewery edition: remaster your system and distribuite it",
-  "version": "9.1.34",
+  "version": "9.1.35",
   "author": "Piero Proietti @pieroproietti",
   "bin": {
     "eggs": "bin/run"