haoshoku 2.0.0 → 2.0.2

package/README.md

@@ -17,7 +17,7 @@ bun haoshoku.js
 **Haoshoku** (formerly Bankai) is a modular, multi-distro Linux setup and configuration toolkit. It automates the installation of essential applications, developer tools, terminal configs, and user environment tweaks.
 
 > [!NOTE]
-> **Haoshoku** (from the anime *One Piece*) means ["Color of the Supreme King"](https://onepiece.fandom.com/wiki/Haki/Supreme_King_Haki). It imposes your will on the operating system, forcing it to submit to your configuration.
+> **Haoshoku** (referencing ["Supreme King Haki"](https://onepiece.fandom.com/wiki/Haki/Supreme_King_Haki) from *One Piece*) serves as an authoritative configuration manager, enforcing a strict and consistent environment setup across your Linux systems.
 
 > [!IMPORTANT]
 > **Rebranding & Migration**: This project was previously known as **Bankai** and was available on **PyPI** (Python). It has been renamed to **Haoshoku** and is now available on **NPM** (JavaScript/Bun).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haoshoku",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "module": "haoshoku.js",
   "type": "module",
   "bin": {

package/src/os_scripts/debian_server.js

@@ -29,7 +29,10 @@ async function promptUser(message, initial = false) {
 async function installEssentials() {
   log.info("Updating system and installing essentials...");
   await runCommand("sudo apt update && sudo apt upgrade -y");
-  await runCommand("sudo apt install -y curl wget git vim ufw fail2ban software-properties-common");
+  // Split installation to ensure core tools are installed even if optional ones fail
+  await runCommand("sudo apt install -y curl wget git vim ufw fail2ban");
+  // Try installing software-properties-common separately as it might not be available on all minimal images
+  await runCommand("sudo apt install -y software-properties-common", { check: false });
 }
 
 async function setupSsh() {
@@ -56,8 +59,11 @@ async function setupSsh() {
 async function configureFishShell() {
   if (!(await commandExists("fish"))) {
     log.info("Installing Fish shell...");
-    await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
-    await runCommand("sudo apt update");
+    // Only try adding PPA if software-properties-common was installed successfully
+    if (await commandExists("add-apt-repository")) {
+      await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
+      await runCommand("sudo apt update");
+    }
     await runCommand("sudo apt install -y fish");
   }
 
@@ -77,8 +83,10 @@ async function configureFishShell() {
   // Ensure fish config dir exists
   fs.mkdirSync(FISH_CONFIG_DIR, { recursive: true });
 
+  // Install Fisher itself first
+  await runCommand('fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher"');
+
   const fisherPlugins = [
-    "jorgebucaran/fisher",
     "meaningful-ooo/sponge",
     "jorgebucaran/nvm.fish",
     "franciscolourenco/done",