penguins-eggs 25.12.7 → 25.12.16

package/package.json

@@ -1,127 +1,133 @@
 {
-  "name": "penguins-eggs",
-  "shortName": "eggs",
-  "description": "A remaster system tool, compatible with Almalinux, Alpine, Arch, Debian, Devuan, Fedora, Manjaro, Opensuse, Ubuntu and derivatives",
-  "version": "25.12.7",
-  "author": "Piero Proietti",
-  "bin": {
-    "eggs": "./bin/run.js"
-  },
-  "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
-  "dependencies": {
-    "@oclif/core": "^4.8.0",
-    "@oclif/plugin-autocomplete": "^3.2.39",
-    "@oclif/plugin-help": "^6.2.36",
-    "@oclif/plugin-version": "^2.2.36",
-    "@types/express": "^5.0.6",
-    "ansis": "^4.2.0",
-    "axios": "^1.13.2",
-    "bcryptjs": "^3.0.3",
-    "chalk": "^5.6.2",
-    "cli-cursor": "^5.0.0",
-    "debug": "^4.4.3",
-    "express": "^5.2.1",
-    "ink": "^5",
-    "ink-progress-bar": "^3.0.0",
-    "ink-spinner": "^5.0.0",
-    "inquirer": "^12.11.0",
-    "js-yaml": "^4.1.1",
-    "mustache": "^4.2.0",
-    "netmask": "^2.0.2",
-    "react": "^18.3.1",
-    "read": "^4.1.0",
-    "systeminformation": "^5.27.11",
-    "tftp": "^0.1.2",
-    "ws": "^8.18.3"
-  },
-  "devDependencies": {
-    "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^4.1.15",
-    "@types/bcryptjs": "^3.0.0",
-    "@types/chai": "^5.2.3",
-    "@types/debug": "^4.1.12",
-    "@types/glob": "^9.0.0",
-    "@types/inquirer": "^9.0.9",
-    "@types/js-yaml": "^4.0.9",
-    "@types/mocha": "^10.0.8",
-    "@types/mustache": "^4.2.6",
-    "@types/netmask": "^2.0.6",
-    "@types/node": "^22.15.30",
-    "@types/react": "^18.3.18",
-    "@types/read": "^0.0.32",
-    "@types/ws": "^8.18.1",
-    "chai": "^6.2.1",
-    "eslint": "^9.39.1",
-    "eslint-config-oclif": "^6.0.124",
-    "eslint-config-prettier": "^10.1.8",
-    "glob": "^13.0.0",
-    "mocha": "^11.7.5",
-    "oclif": "^4.22.54",
-    "perrisbrewery": "^25.9.16",
-    "prettier": "^3.7.4",
-    "shx": "^0.4.0",
-    "ts-node": "10.9.2",
-    "ts-prune": "^0.10.3",
-    "typescript": "^5.9.3"
-  },
-  "engines": {
-    "node": ">=22.0.0"
-  },
-  "files": [
-    ".oclif.manifest.json",
-    "/addons",
-    "/assets",
-    "/bin",
-    "/conf",
-    "/dist",
-    "/dracut",
-    "/eui",
-    "/manpages",
-    "/mkinitcpio",
-    "/mkinitfs",
-    "/perrisbrewery",
-    "/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"
+    "name": "penguins-eggs",
+    "shortName": "eggs",
+    "description": "A remaster system tool, compatible with Almalinux, Alpine, Arch, Debian, Devuan, Fedora, Manjaro, Opensuse, Ubuntu and derivatives",
+    "version": "25.12.16",
+    "author": "Piero Proietti",
+    "bin": {
+        "eggs": "./bin/run.js"
+    },
+    "bugs": "https://github.com/pieroproietti/penguins-eggs/issues",
+    "dependencies": {
+        "@oclif/core": "^4.8.0",
+        "@oclif/plugin-autocomplete": "^3.2.39",
+        "@oclif/plugin-help": "^6.2.36",
+        "@oclif/plugin-version": "^2.2.36",
+        "@types/express": "^5.0.6",
+        "ansis": "^4.2.0",
+        "axios": "^1.13.2",
+        "bcryptjs": "^3.0.3",
+        "chalk": "^5.6.2",
+        "cli-cursor": "^5.0.0",
+        "debug": "^4.4.3",
+        "express": "^5.2.1",
+        "ink": "^5",
+        "ink-progress-bar": "^3.0.0",
+        "ink-spinner": "^5.0.0",
+        "inquirer": "^12.11.0",
+        "js-yaml": "^4.1.1",
+        "mustache": "^4.2.0",
+        "netmask": "^2.0.2",
+        "react": "^18.3.1",
+        "read": "^4.1.0",
+        "systeminformation": "^5.27.11",
+        "tftp": "^0.1.2",
+        "ws": "^8.18.3"
+    },
+    "devDependencies": {
+        "@oclif/prettier-config": "^0.2.1",
+        "@oclif/test": "^4.1.15",
+        "@types/bcryptjs": "^3.0.0",
+        "@types/chai": "^5.2.3",
+        "@types/debug": "^4.1.12",
+        "@types/glob": "^9.0.0",
+        "@types/inquirer": "^9.0.9",
+        "@types/js-yaml": "^4.0.9",
+        "@types/mocha": "^10.0.8",
+        "@types/mustache": "^4.2.6",
+        "@types/netmask": "^2.0.6",
+        "@types/node": "^22.15.30",
+        "@types/react": "^18.3.18",
+        "@types/read": "^0.0.32",
+        "@types/ws": "^8.18.1",
+        "chai": "^6.2.1",
+        "eslint": "^9.39.1",
+        "eslint-config-oclif": "^6.0.126",
+        "eslint-config-prettier": "^10.1.8",
+        "glob": "^13.0.0",
+        "mocha": "^11.7.5",
+        "oclif": "^4.22.57",
+        "perrisbrewery": "^25.9.16",
+        "prettier": "^3.7.4",
+        "shx": "^0.4.0",
+        "ts-node": "10.9.2",
+        "ts-prune": "^0.10.3",
+        "typescript": "^5.9.3"
+    },
+    "engines": {
+        "node": ">=22.0.0"
+    },
+    "files": [
+        ".oclif.manifest.json",
+        "/addons",
+        "/assets",
+        "/bin",
+        "/conf",
+        "/dist",
+        "/dracut",
+        "/eui",
+        "/manpages",
+        "/mkinitcpio",
+        "/mkinitfs",
+        "/perrisbrewery",
+        "/scripts"
     ],
-    "topicSeparator": " ",
-    "topics": {
-      "hello": {
-        "description": "Say hello to the world and others"
-      }
+    "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": {
+        "appimage": "pnpm build && ./appimage.sh",
+        "build": "pnpm clean && shx rm -rf dist && tsc -p . && oclif manifest",
+        "clean": "rm -rf build dist *.AppImage AppDir",
+        "deb": "pnpm build && pb deb --release $(cat ./release)",
+        "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
+        "lint": "eslint . --ext .ts",
+        "manifest": "oclif manifest",
+        "postbuild": "shx cp -r bin dist/",
+        "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"
+        }
     }
-  },
-  "repository": "pieroproietti/penguins-eggs",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "appimage": "pnpm build && ./appimage.sh",
-    "build": "pnpm clean && shx rm -rf dist && tsc -p . && oclif manifest",
-    "clean": "rm -rf build dist *.AppImage AppDir",
-    "deb": "pnpm build && pb deb --release $(cat ./release)",
-    "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
-    "lint": "eslint . --ext .ts",
-    "manifest": "oclif manifest",
-    "postbuild": "shx cp -r bin dist/",
-    "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"
-  }
-}
+}

package/scripts/restore_homecrypt_krill.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# ==============================================================================
+# SCRIPT DI RIPRISTINO DATI UTENTE CRITTOGRAFATI (--HOMECRYPT) PER KRILL
+# LIVE_HOME_DEVICE $1   device LUKS già sbloccato
+# TARGET_ROOT $2        root di destinazione
+# ==============================================================================
+
+# --- Variabili di Configurazione ---
+LIVE_HOME_DEVICE="$1"
+TARGET_ROOT="$2"
+
+RESTORE_MNTPOINT="/tmp/live_home_restore"
+TARGET_HOME_MNTPOINT="${TARGET_ROOT}/home"
+BACKUP_DIR="${RESTORE_MNTPOINT}/.system-backup"
+
+# 1. Verifica Condizione Cruciale: Il volume LUKS è sbloccato?
+if [ ! -b "${LIVE_HOME_DEVICE}" ]; then
+    exit 0
+fi
+
+# 2. Montaggio del Volume Decrittato (solo lettura)
+mkdir -p "${RESTORE_MNTPOINT}"
+if ! mount -o ro "${LIVE_HOME_DEVICE}" "${RESTORE_MNTPOINT}"; then
+    exit 1
+fi
+
+# 3. Copia Ricorsiva dei Dati Utente
+rsync -aH "${RESTORE_MNTPOINT}/" "${TARGET_HOME_MNTPOINT}/"
+
+# 4. Ripristino dei File di Sistema (`.system-backup`)
+if [ -d "${BACKUP_DIR}" ]; then
+
+    # 4.1. Ripristino /etc/passwd e /etc/shadow
+    # Aggiunge utenti con UID >= 1000, evitando duplicati
+    while IFS=: read -r username password uid gid gecos home shell; do
+        if ! grep -q "^${username}:" ${TARGET_ROOT}/etc/passwd; then
+            # La ridirezione >> è ora eseguita dal processo principale
+            echo "${username}:${password}:${uid}:${gid}:${gecos}:${home}:${shell}" >> ${TARGET_ROOT}/etc/passwd
+            grep "^${username}:" ${BACKUP_DIR}/shadow >> ${TARGET_ROOT}/etc/shadow
+        fi
+    done < ${BACKUP_DIR}/passwd
+
+    # 4.2. Ripristino Group/Gshadow (sovrascrittura)
+    #echo "   - Ripristino file /etc/group e /etc/gshadow."
+    cp ${BACKUP_DIR}/group ${TARGET_ROOT}/etc/group
+    cp ${BACKUP_DIR}/gshadow ${TARGET_ROOT}/etc/gshadow
+
+    # 4.3. Ripristino Configurazioni Display Manager
+    [ -d ${BACKUP_DIR}/gdm3 ] && rsync -ah ${BACKUP_DIR}/gdm3 ${TARGET_ROOT}/etc/
+    [ -d ${BACKUP_DIR}/gdm ] && rsync -ah ${BACKUP_DIR}/gdm ${TARGET_ROOT}/etc/
+    [ -d ${BACKUP_DIR}/lightdm ] && rsync -ah ${BACKUP_DIR}/lightdm ${TARGET_ROOT}/etc/
+    [ -e ${BACKUP_DIR}/sddm.conf ] && cp -a ${BACKUP_DIR}/sddm.conf ${TARGET_ROOT}/etc/
+    [ -d ${BACKUP_DIR}/sddm.conf.d ] && rsync -ah ${BACKUP_DIR}/sddm.conf.d ${TARGET_ROOT}/etc/
+
+fi
+
+# 5. CORREZIONE DEI PERMESSI UTENTE (la parte mancante)
+
+# Itera su tutte le directory utente all'interno del mountpoint di ripristino
+find "${RESTORE_MNTPOINT}" -maxdepth 1 -mindepth 1 -type d ! -name '.system-backup' | while read dir_path; do
+    
+    username=$(basename "${dir_path}")
+    
+    # Escludi la directory root se dovesse essere presente
+    if [ "${username}" != "root" ]; then
+
+        # Recupera l'UID, GID e la directory home dal file passwd del TARGET
+        # Nota: Usiamo grep e awk per leggere l'utente dal file ripristinato
+        user_info=$(grep "^${username}:" "${TARGET_ROOT}/etc/passwd")
+
+        if [ -n "$user_info" ]; then
+            # Estrai UID e GID dal record in TARGET/etc/passwd
+            uid_target=$(echo "$user_info" | awk -F: '{print $3}')
+            gid_target=$(echo "$user_info" | awk -F: '{print $4}')
+            
+            # Esegui chown ricorsivo sulla directory home del target
+            if [ -d "${TARGET_HOME_MNTPOINT}/${username}" ]; then
+                chown -R "${uid_target}:${gid_target}" "${TARGET_HOME_MNTPOINT}/${username}"
+            fi
+        fi
+    fi
+done
+
+# Rimuovi la directory di backup dalla home utente nel sistema installato
+rm -rf ${TARGET_HOME_MNTPOINT}/.system-backup
+
+
+# 6. Pulizia Finale
+umount "${RESTORE_MNTPOINT}"
+rmdir "${RESTORE_MNTPOINT}"
+
+exit 0