@gengjiawen/os-init 1.7.1 → 1.8.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.8.0](https://github.com/gengjiawen/os-init/compare/v1.7.1...v1.8.0) (2025-11-10)
+
+
+### Features
+
+* bump andoid tool version ([e54ef83](https://github.com/gengjiawen/os-init/commit/e54ef835b9a4baa03f89cfca651b0d032364734b))
+* refine default sdk home ([690d4ef](https://github.com/gengjiawen/os-init/commit/690d4efdeec1b96da2296e1275cfa2898382fea2))
+
 ## [1.7.1](https://github.com/gengjiawen/os-init/compare/v1.7.0...v1.7.1) (2025-11-09)
 
 

package/README.md

@@ -2,41 +2,10 @@
 
 [![npm version](https://img.shields.io/npm/v/%40gengjiawen%2Fos-init)](https://www.npmjs.com/package/@gengjiawen/os-init)
 
-A CLI tool to quickly configure AI development tools and environments.
+A CLI tool to quickly configure development tools and environments.
 
 ## Usage
 
-### Configure Claude Code
-
-```bash
-pnpx @gengjiawen/os-init set-cc <API_KEY>
-```
-
-Configures Claude Code Router with your API key. This command will:
-- Write `~/.claude-code-router/config.json`
-- Write `~/.claude/settings.json`
-- Install global tools: `@anthropic-ai/claude-code`, `@musistudio/claude-code-router`
-
-### Configure Codex CLI
-
-```bash
-pnpx @gengjiawen/os-init set-codex <API_KEY>
-```
-
-Configures Codex CLI with your API key. This command will:
-- Write `~/.codex/config.toml`
-- Write `~/.codex/auth.json`
-- Install global tool: `@openai/codex`
-
-### Configure Raycast AI
-
-```bash
-pnpx @gengjiawen/os-init set-raycast-ai <API_KEY>
-```
-
-Configures Raycast AI providers with your API key. This command will:
-- Write `~/.config/raycast/ai/providers.yaml`
-
 ### Setup Dev Environment
 
 ```bash
@@ -44,12 +13,14 @@ pnpx @gengjiawen/os-init set-dev <SSH_PUBLIC_KEY>
 ```
 
 Sets up a Docker-based development environment with SSH access. This command will:
+
 - Copy `dev-setup` directory to your current directory (or specify with `-t, --target <dir>`)
 - Configure SSH public key in Dockerfile
 - Automatically run `docker-compose build && docker-compose up -d` (if docker-compose is available)
 - Display SSH connection command with your local IP address
 
 Example:
+
 ```bash
 pnpx @gengjiawen/os-init set-dev "ssh-rsa AAAAB3NzaC1yc2..."
 ```
@@ -61,6 +32,7 @@ pnpx @gengjiawen/os-init set-android
 ```
 
 Sets up a complete Android development environment on macOS and Linux. This command will:
+
 - Install Android SDK to `~/Android` (or custom path with `--android-home <path>`)
 - Download and install Android SDK Command-line Tools, Platform Tools, Build Tools, CMake, and NDK
 - Automatically accept Android SDK licenses
@@ -69,6 +41,7 @@ Sets up a complete Android development environment on macOS and Linux. This comm
 - No sudo access required
 
 Example:
+
 ```bash
 # Custom installation path
 pnpx @gengjiawen/os-init set-android --android-home ~/my-android-sdk
@@ -79,4 +52,38 @@ pnpx @gengjiawen/os-init set-android --skip-env-vars
 
 ---
 
+### Configure Claude Code
+
+```bash
+pnpx @gengjiawen/os-init set-cc <API_KEY>
+```
+
+Configures Claude Code Router with your API key. This command will:
+
+- Write `~/.claude-code-router/config.json`
+- Write `~/.claude/settings.json`
+- Install global tools: `@anthropic-ai/claude-code`, `@musistudio/claude-code-router`
+
+### Configure Codex CLI
+
+```bash
+pnpx @gengjiawen/os-init set-codex <API_KEY>
+```
+
+Configures Codex CLI with your API key. This command will:
+
+- Write `~/.codex/config.toml`
+- Write `~/.codex/auth.json`
+- Install global tool: `@openai/codex`
+
+### Configure Raycast AI
+
+```bash
+pnpx @gengjiawen/os-init set-raycast-ai <API_KEY>
+```
+
+Configures Raycast AI providers with your API key. This command will:
+
+- Write `~/.config/raycast/ai/providers.yaml`
+
 Project generated by [gengjiawen/ts-scaffold](https://github.com/gengjiawen/ts-scaffold)

package/build/android-setup.js

@@ -10,12 +10,29 @@ const fish_shell_utils_1 = require("./fish-shell-utils");
 const ANDROID_CONFIG = {
     sdkVersion: '11076708',
     platformVersion: 'android-36',
-    buildToolsVersion: '36.0.0',
-    cmakeVersion: '3.30.5',
+    buildToolsVersion: '36.1.0',
+    cmakeVersion: '4.1.2',
     ndkVersion: '29.0.14206865',
 };
 function getDefaultAndroidHome() {
-    return path.join(os.homedir(), 'Android');
+    const { ANDROID_SDK_ROOT, ANDROID_HOME, LOCALAPPDATA } = process.env;
+    if (ANDROID_SDK_ROOT && ANDROID_SDK_ROOT.trim())
+        return ANDROID_SDK_ROOT;
+    if (ANDROID_HOME && ANDROID_HOME.trim())
+        return ANDROID_HOME;
+    const home = os.homedir();
+    switch (process.platform) {
+        case 'darwin':
+            return path.join(home, 'Library', 'Android', 'sdk');
+        case 'linux':
+            return path.join(home, 'Android', 'Sdk');
+        case 'win32':
+            return LOCALAPPDATA
+                ? path.join(LOCALAPPDATA, 'Android', 'Sdk')
+                : path.join(home, 'AppData', 'Local', 'Android', 'Sdk');
+        default:
+            return path.join(home, 'Android', 'Sdk');
+    }
 }
 function getSdkDownloadUrl(sdkVersion) {
     const platform = os.platform();
@@ -72,7 +89,7 @@ function appendEnvVarsToShellConfig(rcFile, envVars) {
         console.log(`Environment variables already exist in: ${bashrcFile}`);
     }
     if (shell.includes('fish')) {
-        (0, fish_shell_utils_1.appendFishImportScript)(rcFile);
+        (0, fish_shell_utils_1.appendFishImportScript)();
     }
 }
 async function setupAndroidEnvironment(options) {

package/build/fish-shell-utils.d.ts

@@ -1,2 +1,2 @@
 export declare function getFishImportBashExports(): string;
-export declare function appendFishImportScript(fishConfigPath: string): void;
+export declare function appendFishImportScript(): void;

package/build/fish-shell-utils.js

@@ -4,6 +4,7 @@ exports.getFishImportBashExports = getFishImportBashExports;
 exports.appendFishImportScript = appendFishImportScript;
 const fs = require("fs");
 const path = require("path");
+const os = require("os");
 function getFishImportBashExports() {
     return `
 # ===== Import environment variables from .bashrc - START (2025-11-09) =====
@@ -36,7 +37,13 @@ end
 # ===== Import environment variables from .bashrc - END =====
 `;
 }
-function appendFishImportScript(fishConfigPath) {
+function appendFishImportScript() {
+    const homeDir = os.homedir();
+    const fishConfigPath = path.join(homeDir, '.config', 'fish', 'config.fish');
+    if (!fs.existsSync(fishConfigPath)) {
+        console.log('Fish shell config not found, skipping fish setup');
+        return;
+    }
     const configDir = path.dirname(fishConfigPath);
     if (!fs.existsSync(configDir)) {
         fs.mkdirSync(configDir, { recursive: true });

package/libs/android-setup.ts

@@ -9,14 +9,32 @@ import { appendFishImportScript } from './fish-shell-utils'
 const ANDROID_CONFIG = {
   sdkVersion: '11076708',
   platformVersion: 'android-36',
-  buildToolsVersion: '36.0.0',
-  cmakeVersion: '3.30.5',
+  buildToolsVersion: '36.1.0',
+  cmakeVersion: '4.1.2',
   ndkVersion: '29.0.14206865',
 } as const
 
 /** Get default Android home directory */
 function getDefaultAndroidHome(): string {
-  return path.join(os.homedir(), 'Android')
+  const { ANDROID_SDK_ROOT, ANDROID_HOME, LOCALAPPDATA } = process.env
+
+  if (ANDROID_SDK_ROOT && ANDROID_SDK_ROOT.trim()) return ANDROID_SDK_ROOT
+  if (ANDROID_HOME && ANDROID_HOME.trim()) return ANDROID_HOME
+
+  const home = os.homedir()
+  switch (process.platform) {
+    case 'darwin':
+      return path.join(home, 'Library', 'Android', 'sdk')
+    case 'linux':
+      return path.join(home, 'Android', 'Sdk')
+    case 'win32':
+      return LOCALAPPDATA
+        ? path.join(LOCALAPPDATA, 'Android', 'Sdk')
+        : path.join(home, 'AppData', 'Local', 'Android', 'Sdk')
+    default:
+      // Reasonable fallback for other POSIX-like environments
+      return path.join(home, 'Android', 'Sdk')
+  }
 }
 
 /** Get SDK download URL based on platform */
@@ -87,7 +105,7 @@ function appendEnvVarsToShellConfig(rcFile: string, envVars: string): void {
 
   // For fish shell, always write to bashrc first, then add import script to fish config
   if (shell.includes('fish')) {
-    appendFishImportScript(rcFile)
+    appendFishImportScript()
   }
 }
 

package/libs/fish-shell-utils.ts

@@ -1,5 +1,6 @@
 import * as fs from 'fs'
 import * as path from 'path'
+import * as os from 'os'
 
 /** Get Fish shell script to import bash exports */
 export function getFishImportBashExports(): string {
@@ -39,8 +40,18 @@ end
  * Append bash import script to Fish shell config file
  * This function adds the import script to fish config.fish to automatically
  * source environment variables from .bashrc
+ * It detects fish shell by checking if ~/.config/fish/config.fish exists
  */
-export function appendFishImportScript(fishConfigPath: string): void {
+export function appendFishImportScript(): void {
+  const homeDir = os.homedir()
+  const fishConfigPath = path.join(homeDir, '.config', 'fish', 'config.fish')
+
+  // Detect if fish shell exists by checking config file
+  if (!fs.existsSync(fishConfigPath)) {
+    console.log('Fish shell config not found, skipping fish setup')
+    return
+  }
+
   // Ensure fish config directory exists
   const configDir = path.dirname(fishConfigPath)
   if (!fs.existsSync(configDir)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gengjiawen/os-init",
   "private": false,
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "",
   "main": "index.js",
   "bin": {