penguins-eggs 9.4.5 → 9.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.oclif.manifest.json +1 -1
- package/README.md +14 -12
- package/addons/README.md +3 -3
- package/addons/eggs/theme/applications/{install-debian.desktop → install-system.desktop} +3 -3
- package/assets/calamares/{install-debian → install-system.sh} +7 -0
- package/conf/distros/bionic/calamares/calamares-modules/after-bootloader/after-bootloader.sh +1 -1
- package/conf/distros/buster/calamares/calamares-modules/cleanup/cleanup.sh +1 -1
- package/conf/distros/jessie/krill/krill-modules/remove-link/remove-link.sh +1 -1
- package/conf/distros/rolling/calamares/modules/shellprocess_removelink.yml +1 -1
- package/dist/classes/distro.js +3 -2
- package/dist/classes/incubation/incubator.js +8 -8
- package/dist/classes/ovary.js +23 -10
- package/dist/classes/tailor.js +278 -246
- package/dist/commands/wardrobe/get.js +3 -1
- package/dist/commands/wardrobe/list.js +34 -11
- package/dist/commands/wardrobe/show.js +13 -1
- package/dist/commands/wardrobe/wear.js +2 -11
- package/dist/krill/modules/remove-installer-link.js +1 -1
- package/manpages/doc/man/eggs.html +1 -1
- package/mkinitcpio/archlinux/mkinitcpio-produce.conf +1 -1
- package/mkinitcpio/blendos/README.md +7 -0
- package/mkinitcpio/blendos/mkinitcpio-install.conf +4 -0
- package/mkinitcpio/blendos/mkinitcpio-produce.conf +7 -0
- package/mkinitcpio/manjaro/README.md +1 -1
- package/package.json +10 -10
- package/mkinitcpio/garuda/README.md +0 -29
- /package/addons/eggs/theme/artwork/{install-debian.png → install-system.png} +0 -0
|
@@ -36,7 +36,9 @@ class Get extends core_1.Command {
|
|
|
36
36
|
process.exit(0);
|
|
37
37
|
}
|
|
38
38
|
const wardrobe = (0, path_1.basename)(repo); // ~/.eggs-wardrobe
|
|
39
|
-
|
|
39
|
+
// git clone -b <branchname> --single-branch
|
|
40
|
+
// const result = await exec(`git clone -b devel --single-branch --depth 1 ${repo} ${await Utils.wardrobe()}`)
|
|
41
|
+
const result = await (0, utils_2.exec)(`git clone --single-branch --depth 1 ${repo} ${await utils_1.default.wardrobe()}`);
|
|
40
42
|
if (result.code === 0) {
|
|
41
43
|
utils_1.default.warning(`you get new wardrobe from repo: ${repo} in ${await utils_1.default.wardrobe()}`);
|
|
42
44
|
}
|
|
@@ -14,6 +14,7 @@ const utils_1 = __importDefault(require("../../classes/utils"));
|
|
|
14
14
|
const path_1 = __importDefault(require("path"));
|
|
15
15
|
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
16
16
|
const fs_1 = __importDefault(require("fs"));
|
|
17
|
+
const distro_1 = __importDefault(require("../../classes/distro"));
|
|
17
18
|
// libraries
|
|
18
19
|
const chalk_1 = __importDefault(require("chalk"));
|
|
19
20
|
/**
|
|
@@ -32,24 +33,44 @@ class List extends core_1.Command {
|
|
|
32
33
|
* wardobe
|
|
33
34
|
*/
|
|
34
35
|
let wardrobe = await utils_1.default.wardrobe();
|
|
35
|
-
if (
|
|
36
|
-
|
|
36
|
+
if (flags.distro === undefined) {
|
|
37
|
+
if (this.argv['0'] !== undefined) {
|
|
38
|
+
wardrobe = this.argv['0'];
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* seleziona distro
|
|
43
|
+
*/
|
|
44
|
+
let index = '';
|
|
45
|
+
let distro = new distro_1.default();
|
|
46
|
+
if (distro.distroLike === "Arch") {
|
|
47
|
+
index = 'arch';
|
|
48
|
+
}
|
|
49
|
+
else if (distro.distroLike === "Debian" || distro.distroLike === "Devuan") {
|
|
50
|
+
index = 'debian';
|
|
51
|
+
}
|
|
52
|
+
else if (distro.distroLike === "Ubuntu") {
|
|
53
|
+
index = 'ubuntu';
|
|
37
54
|
}
|
|
55
|
+
if (flags.distro !== undefined) {
|
|
56
|
+
index = flags.distro;
|
|
57
|
+
}
|
|
58
|
+
index += '.yml';
|
|
59
|
+
console.log(chalk_1.default.green('wardrobe: ') + wardrobe);
|
|
60
|
+
console.log();
|
|
38
61
|
wardrobe = `${path_1.default.resolve(process.cwd(), wardrobe)}/`;
|
|
39
62
|
if (!fs_1.default.existsSync(wardrobe)) {
|
|
40
63
|
utils_1.default.warning(`wardrobe: ${wardrobe} not found!`);
|
|
41
64
|
process.exit();
|
|
42
65
|
}
|
|
43
|
-
console.log(chalk_1.default.green('wardrobe: ') + wardrobe);
|
|
44
|
-
console.log();
|
|
45
66
|
/**
|
|
46
67
|
* costumes
|
|
47
68
|
*/
|
|
48
69
|
const costumes = fs_1.default.readdirSync(`${wardrobe}costumes/`);
|
|
49
70
|
console.log(chalk_1.default.green('costumes: '));
|
|
50
71
|
for (const costume of costumes) {
|
|
51
|
-
if (fs_1.default.existsSync(`${wardrobe}costumes/${costume}
|
|
52
|
-
const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}costumes/${costume}
|
|
72
|
+
if (fs_1.default.existsSync(`${wardrobe}costumes/${costume}/${index}`)) {
|
|
73
|
+
const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}costumes/${costume}/${index}`, 'utf-8'));
|
|
53
74
|
console.log(chalk_1.default.cyan(costume) + ': ' + materials.description);
|
|
54
75
|
}
|
|
55
76
|
}
|
|
@@ -60,8 +81,8 @@ class List extends core_1.Command {
|
|
|
60
81
|
const accessories = fs_1.default.readdirSync(`${wardrobe}/accessories/`);
|
|
61
82
|
console.log(chalk_1.default.green('accessories: '));
|
|
62
83
|
for (const accessory of accessories) {
|
|
63
|
-
if (fs_1.default.existsSync(`${wardrobe}/accessories/${accessory}
|
|
64
|
-
const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/accessories/${accessory}
|
|
84
|
+
if (fs_1.default.existsSync(`${wardrobe}/accessories/${accessory}/${index}`)) {
|
|
85
|
+
const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/accessories/${accessory}/${index}`, 'utf-8'));
|
|
65
86
|
console.log(chalk_1.default.cyan(accessory) + ': ' + materials.description);
|
|
66
87
|
}
|
|
67
88
|
}
|
|
@@ -72,8 +93,8 @@ class List extends core_1.Command {
|
|
|
72
93
|
const servers = fs_1.default.readdirSync(`${wardrobe}/servers/`);
|
|
73
94
|
console.log(chalk_1.default.green('servers: '));
|
|
74
95
|
for (const server of servers) {
|
|
75
|
-
if (fs_1.default.existsSync(`${wardrobe}/servers/${server}
|
|
76
|
-
const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/servers/${server}
|
|
96
|
+
if (fs_1.default.existsSync(`${wardrobe}/servers/${server}/${index}`)) {
|
|
97
|
+
const materials = js_yaml_1.default.load(fs_1.default.readFileSync(`${wardrobe}/servers/${server}/${index}`, 'utf-8'));
|
|
77
98
|
console.log(chalk_1.default.cyan(server) + ': ' + materials.description);
|
|
78
99
|
}
|
|
79
100
|
}
|
|
@@ -82,12 +103,14 @@ class List extends core_1.Command {
|
|
|
82
103
|
}
|
|
83
104
|
List.flags = {
|
|
84
105
|
help: core_1.Flags.help({ char: 'h' }),
|
|
106
|
+
distro: core_1.Flags.string({ char: 'd', description: 'distro' }),
|
|
85
107
|
verbose: core_1.Flags.boolean({ char: 'v' }),
|
|
86
108
|
};
|
|
87
109
|
List.args = [{ name: 'wardrobe', description: 'wardrobe', required: false }];
|
|
88
110
|
List.description = 'list costumes and accessoires in wardrobe';
|
|
89
111
|
List.examples = [
|
|
90
112
|
'eggs wardrobe list',
|
|
91
|
-
'eggs wardrobe list your-
|
|
113
|
+
'eggs wardrobe list your-wardrobe',
|
|
114
|
+
'eggs wardrobe list --distro arch',
|
|
92
115
|
];
|
|
93
116
|
exports.default = List;
|
|
@@ -12,6 +12,7 @@ const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
|
12
12
|
const fs_1 = __importDefault(require("fs"));
|
|
13
13
|
const path_1 = __importDefault(require("path"));
|
|
14
14
|
const chalk_1 = __importDefault(require("chalk"));
|
|
15
|
+
const distro_1 = __importDefault(require("../../classes/distro"));
|
|
15
16
|
const utils_1 = __importDefault(require("../../classes/utils"));
|
|
16
17
|
/**
|
|
17
18
|
*
|
|
@@ -51,7 +52,18 @@ class Show extends core_1.Command {
|
|
|
51
52
|
/**
|
|
52
53
|
* tailorList
|
|
53
54
|
*/
|
|
54
|
-
|
|
55
|
+
let distro = new distro_1.default();
|
|
56
|
+
let index = '';
|
|
57
|
+
if (distro.distroLike === "Arch") {
|
|
58
|
+
index = 'arch.yml';
|
|
59
|
+
}
|
|
60
|
+
else if (distro.distroLike === "Debian" || distro.distroLike === "Devuan") {
|
|
61
|
+
index = 'debian.yml';
|
|
62
|
+
}
|
|
63
|
+
else if (distro.distroLike === "Debian") {
|
|
64
|
+
index = 'ubuntu.yml';
|
|
65
|
+
}
|
|
66
|
+
const tailorList = `${costume}/${index}`;
|
|
55
67
|
if (!fs_1.default.existsSync(tailorList)) {
|
|
56
68
|
utils_1.default.warning(`index.yml not found in : ${costume}!`);
|
|
57
69
|
process.exit();
|
|
@@ -46,7 +46,7 @@ class Wear extends core_1.Command {
|
|
|
46
46
|
*/
|
|
47
47
|
let costume = 'costumes/colibri';
|
|
48
48
|
if (this.argv['0'] !== undefined) {
|
|
49
|
-
costume = this.argv['0']; // 12345678
|
|
49
|
+
costume = this.argv['0']; // 12345678 12345678901 1234567
|
|
50
50
|
if (costume.slice(0, 8) !== 'costumes' && costume.slice(0, 11) !== 'accessories' && costume.slice(0, 7) !== 'servers') {
|
|
51
51
|
costume = `costumes/${costume}`;
|
|
52
52
|
}
|
|
@@ -54,15 +54,7 @@ class Wear extends core_1.Command {
|
|
|
54
54
|
costume = wardrobe + costume;
|
|
55
55
|
console.log(costume);
|
|
56
56
|
if (!fs_1.default.existsSync(costume)) {
|
|
57
|
-
|
|
58
|
-
process.exit();
|
|
59
|
-
}
|
|
60
|
-
/**
|
|
61
|
-
* tailorList
|
|
62
|
-
*/
|
|
63
|
-
const tailorList = `${costume}/index.yml`;
|
|
64
|
-
if (!fs_1.default.existsSync(tailorList)) {
|
|
65
|
-
utils_1.default.warning(`index.yml not found in : ${costume}!`);
|
|
57
|
+
utils_1.default.warning(`costume not found in : ${costume}!`);
|
|
66
58
|
process.exit();
|
|
67
59
|
}
|
|
68
60
|
if (await utils_1.default.customConfirm(`Prepare your costume: ${costume}? Select yes to continue...`)) {
|
|
@@ -83,7 +75,6 @@ Wear.flags = {
|
|
|
83
75
|
help: core_1.Flags.help({ char: 'h' }),
|
|
84
76
|
no_accessories: core_1.Flags.boolean({ char: 'a', description: 'not install accessories' }),
|
|
85
77
|
no_firmwares: core_1.Flags.boolean({ char: 'f', description: 'not install firmwares' }),
|
|
86
|
-
silent: core_1.Flags.boolean({ char: 's' }),
|
|
87
78
|
verbose: core_1.Flags.boolean({ char: 'v' }),
|
|
88
79
|
wardrobe: core_1.Flags.string({ char: 'w', description: 'wardrobe' }),
|
|
89
80
|
};
|
|
@@ -29,7 +29,7 @@ async function removeInstallerLink() {
|
|
|
29
29
|
if (lines[i].search('penguins-clinstaller.desktop') !== -1) {
|
|
30
30
|
lines[i] = '#' + lines[i];
|
|
31
31
|
}
|
|
32
|
-
if (lines[i].search('install-
|
|
32
|
+
if (lines[i].search('install-system.desktop') !== -1) {
|
|
33
33
|
lines[i] = '#' + lines[i];
|
|
34
34
|
}
|
|
35
35
|
content += lines[i] + '\n';
|
|
@@ -585,7 +585,7 @@ DESCRIPTION
|
|
|
585
585
|
EXAMPLES
|
|
586
586
|
$ eggs wardrobe list
|
|
587
587
|
|
|
588
|
-
$ eggs wardrobe list your-
|
|
588
|
+
$ eggs wardrobe list your-wardrobe
|
|
589
589
|
</code></pre>
|
|
590
590
|
<h2><code>eggs wardrobe show [COSTUME]</code></h2>
|
|
591
591
|
<p>show costumes/accessories in wardrobe</p>
|
|
@@ -28,7 +28,7 @@ You can use simple USB or USB with ventoy, iso file with proxmox ve, virtualbox,
|
|
|
28
28
|
* penguins-eggs PKGBUILD on [community](https://gitlab.manjaro.org/packages/community/penguins-eggs)
|
|
29
29
|
* penguins-eggs PKGBUILD [my way](https://github.com/pieroproietti/penguins-eggs-manjaro) (*)
|
|
30
30
|
* penguins-eggs [sources](https://github.com/pieroproietti/penguins-eggs)
|
|
31
|
-
* penguins-eggs [book](https://penguins-eggs.net/
|
|
31
|
+
* penguins-eggs [book](https://penguins-eggs.net/docs/Tutorial/users-guide)
|
|
32
32
|
* penguins-eggs [blog](https://penguins-eggs.net)
|
|
33
33
|
|
|
34
34
|
(*) Here we refere always to that, but I hope with same help to solve the problems and have it in community again.
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "penguins-eggs",
|
|
3
3
|
"description": "Perri's Brewery edition: remaster your system and distribuite it",
|
|
4
|
-
"version": "9.4.
|
|
4
|
+
"version": "9.4.9",
|
|
5
5
|
"author": "Piero Proietti @pieroproietti",
|
|
6
6
|
"bin": {
|
|
7
7
|
"eggs": "bin/run"
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"@oclif/plugin-version": "1.2.1",
|
|
16
16
|
"@oclif/plugin-warn-if-update-available": "^2.0.32",
|
|
17
17
|
"@oclif/test": "^2.3.11",
|
|
18
|
-
"axios": "^1.
|
|
18
|
+
"axios": "^1.4.0",
|
|
19
19
|
"chalk": "^4.1.2",
|
|
20
20
|
"etrick": "0.0.3",
|
|
21
21
|
"ink": "^3.2.0",
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"systeminformation": "^5.17.12",
|
|
32
32
|
"tftp": "^0.1.2",
|
|
33
33
|
"tslib": "^2.5.0",
|
|
34
|
-
"typescript": "^5.0.
|
|
34
|
+
"typescript": "^5.0.4"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@tsconfig/recommended": "^1.0.2",
|
|
38
|
-
"@types/chai": "^4.3.
|
|
38
|
+
"@types/chai": "^4.3.5",
|
|
39
39
|
"@types/ini": "^1.3.31",
|
|
40
40
|
"@types/ink-big-text": "^1.2.1",
|
|
41
41
|
"@types/ink-gradient": "^2.0.1",
|
|
@@ -44,11 +44,11 @@
|
|
|
44
44
|
"@types/mocha": "^10.0.1",
|
|
45
45
|
"@types/mustache": "^4.2.2",
|
|
46
46
|
"@types/netmask": "^1.0.30",
|
|
47
|
-
"@types/node": "^18.
|
|
47
|
+
"@types/node": "^18.16.5",
|
|
48
48
|
"@types/node-static": "^0.7.7",
|
|
49
|
-
"@types/react": "^18.
|
|
50
|
-
"@types/shelljs": "^0.8.
|
|
51
|
-
"@typescript-eslint/parser": "^5.
|
|
49
|
+
"@types/react": "^18.2.6",
|
|
50
|
+
"@types/shelljs": "^0.8.12",
|
|
51
|
+
"@typescript-eslint/parser": "^5.59.2",
|
|
52
52
|
"chai": "^4.3.7",
|
|
53
53
|
"eslint": "^7",
|
|
54
54
|
"eslint-config-oclif": "^4.0.0",
|
|
@@ -74,8 +74,8 @@
|
|
|
74
74
|
"/eui",
|
|
75
75
|
"/ipxe",
|
|
76
76
|
"/manpages",
|
|
77
|
-
"/
|
|
78
|
-
"
|
|
77
|
+
"/mkinitcpio",
|
|
78
|
+
"/scripts"
|
|
79
79
|
],
|
|
80
80
|
"homepage": "https://penguins-eggs.net/",
|
|
81
81
|
"keywords": [
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
# Garuda Linux
|
|
2
|
-
|
|
3
|
-
pacman -S garuda-tools-iso
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
mkinitcpio fail with
|
|
7
|
-
|
|
8
|
-
```
|
|
9
|
-
==> Starting build: 5.15.12-zen1-1-zen
|
|
10
|
-
-> Running build hook: [base]
|
|
11
|
-
-> Running build hook: [udev]
|
|
12
|
-
-> Running build hook: [miso_shutdown]
|
|
13
|
-
-> Running build hook: [miso]
|
|
14
|
-
-> Running build hook: [miso_loop_mnt]
|
|
15
|
-
-> Running build hook: [miso_kms]
|
|
16
|
-
==> ERROR: module not found: `bochs_drm'
|
|
17
|
-
-> Running build hook: [modconf]
|
|
18
|
-
-> Running build hook: [block]
|
|
19
|
-
==> WARNING: Possibly missing firmware for module: aic94xx
|
|
20
|
-
==> WARNING: Possibly missing firmware for module: wd719x
|
|
21
|
-
==> WARNING: Possibly missing firmware for module: xhci_pci
|
|
22
|
-
-> Running build hook: [filesystems]
|
|
23
|
-
-> Running build hook: [keyboard]
|
|
24
|
-
-> Running build hook: [keymap]
|
|
25
|
-
==> ERROR: module not found: `bochs_drm'
|
|
26
|
-
Decompress: 408/647 files. Current: ...rnel/udf.ko.zst : 128 KiB... ==> Generating module dependencies
|
|
27
|
-
==> Creating zstd-compressed initcpio image: /home/eggs/ovarium/iso/live/initramfs-linux-zen.img
|
|
28
|
-
==> WARNING: errors were encountered during the build. The image may not be complete.
|
|
29
|
-
```
|
|
File without changes
|