haoshoku 2.0.1 → 2.0.2

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/os_scripts/debian_server.js +12 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "haoshoku",
3
- "version": "2.0.1",
3
+ "version": "2.0.2",
4
4
  "module": "haoshoku.js",
5
5
  "type": "module",
6
6
  "bin": {
package/src/os_scripts/debian_server.js CHANGED
@@ -29,7 +29,10 @@ async function promptUser(message, initial = false) {
29
29
  async function installEssentials() {
30
30
  log.info("Updating system and installing essentials...");
31
31
  await runCommand("sudo apt update && sudo apt upgrade -y");
32
- await runCommand("sudo apt install -y curl wget git vim ufw fail2ban software-properties-common");
32
+ // Split installation to ensure core tools are installed even if optional ones fail
33
+ await runCommand("sudo apt install -y curl wget git vim ufw fail2ban");
34
+ // Try installing software-properties-common separately as it might not be available on all minimal images
35
+ await runCommand("sudo apt install -y software-properties-common", { check: false });
33
36
  }
34
37
 
35
38
  async function setupSsh() {
@@ -56,8 +59,11 @@ async function setupSsh() {
56
59
  async function configureFishShell() {
57
60
  if (!(await commandExists("fish"))) {
58
61
  log.info("Installing Fish shell...");
59
- await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
60
- await runCommand("sudo apt update");
62
+ // Only try adding PPA if software-properties-common was installed successfully
63
+ if (await commandExists("add-apt-repository")) {
64
+ await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
65
+ await runCommand("sudo apt update");
66
+ }
61
67
  await runCommand("sudo apt install -y fish");
62
68
  }
63
69
 
@@ -77,8 +83,10 @@ async function configureFishShell() {
77
83
  // Ensure fish config dir exists
78
84
  fs.mkdirSync(FISH_CONFIG_DIR, { recursive: true });
79
85
 
86
+ // Install Fisher itself first
87
+ await runCommand('fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher"');
88
+
80
89
  const fisherPlugins = [
81
- "jorgebucaran/fisher",
82
90
  "meaningful-ooo/sponge",
83
91
  "jorgebucaran/nvm.fish",
84
92
  "franciscolourenco/done",