@gengjiawen/os-init 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.7.1](https://github.com/gengjiawen/os-init/compare/v1.7.0...v1.7.1) (2025-11-09)
+
+
+### Bug Fixes
+
+* android CI ([#12](https://github.com/gengjiawen/os-init/issues/12)) ([535b011](https://github.com/gengjiawen/os-init/commit/535b0115b513902ceb6fd9ef98bcb8338ac9972e))
+
 ## [1.7.0](https://github.com/gengjiawen/os-init/compare/v1.6.0...v1.7.0) (2025-11-09)
 
 

package/README.md

@@ -57,7 +57,7 @@ pnpx @gengjiawen/os-init set-dev "ssh-rsa AAAAB3NzaC1yc2..."
 ### Setup Android Development Environment
 
 ```bash
-pnpx @gengjiawen/os-init set-android [options]
+pnpx @gengjiawen/os-init set-android
 ```
 
 Sets up a complete Android development environment on macOS and Linux. This command will:
@@ -70,9 +70,6 @@ Sets up a complete Android development environment on macOS and Linux. This comm
 
 Example:
 ```bash
-# Basic installation
-pnpx @gengjiawen/os-init set-android
-
 # Custom installation path
 pnpx @gengjiawen/os-init set-android --android-home ~/my-android-sdk
 

package/build/android-setup.js

@@ -5,7 +5,8 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 const execa_1 = require("execa");
-const unzip_url_1 = require("@compilets/unzip-url");
+const unzip_url_1 = require("@gengjiawen/unzip-url");
+const fish_shell_utils_1 = require("./fish-shell-utils");
 const ANDROID_CONFIG = {
     sdkVersion: '11076708',
     platformVersion: 'android-36',
@@ -30,11 +31,12 @@ function getSdkDownloadUrl(sdkVersion) {
 }
 function getAndroidEnvVars(androidHome, ndkVersion) {
     return `
-# Android development environment
+# ===== Android development environment - START (2025-11-09) =====
 export ANDROID_HOME=${androidHome}
 export ANDROID_SDK_ROOT=\${ANDROID_HOME}
 export ANDROID_NDK_HOME=\${ANDROID_HOME}/ndk/${ndkVersion}
-export PATH=\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin:\${PATH}
+export PATH=\${ANDROID_HOME}/cmdline-tools/bin:\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin:\${PATH}
+# ===== Android development environment - END =====
 `;
 }
 function getShellRcFile() {
@@ -58,12 +60,20 @@ function hasAndroidEnvVars(rcFile) {
     return content.includes('ANDROID_HOME');
 }
 function appendEnvVarsToShellConfig(rcFile, envVars) {
-    const dir = path.dirname(rcFile);
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
+    const shell = process.env.SHELL || '';
+    const homeDir = os.homedir();
+    const bashrcFile = path.join(homeDir, '.bashrc');
+    if (!fs.existsSync(bashrcFile) ||
+        !fs.readFileSync(bashrcFile, 'utf-8').includes('ANDROID_HOME')) {
+        fs.appendFileSync(bashrcFile, envVars);
+        console.log(`Environment variables added to: ${bashrcFile}`);
+    }
+    else {
+        console.log(`Environment variables already exist in: ${bashrcFile}`);
+    }
+    if (shell.includes('fish')) {
+        (0, fish_shell_utils_1.appendFishImportScript)(rcFile);
     }
-    fs.appendFileSync(rcFile, envVars);
-    console.log(`Environment variables added to: ${rcFile}`);
 }
 async function setupAndroidEnvironment(options) {
     const androidHome = options?.androidHome || getDefaultAndroidHome();
@@ -85,32 +95,34 @@ async function setupAndroidEnvironment(options) {
     }
     console.log('\nDownloading and setting up Android SDK...');
     const sdkUrl = getSdkDownloadUrl(sdkVersion);
+    const cmdlineToolsPath = path.join(androidHome, 'cmdline-tools');
+    const latestPath = path.join(cmdlineToolsPath, 'latest');
+    const latestBin = path.join(latestPath, 'bin');
     try {
-        const cmdlineToolsPath = path.join(androidHome, 'cmdline-tools');
-        if (!fs.existsSync(cmdlineToolsPath)) {
-            fs.mkdirSync(cmdlineToolsPath, { recursive: true });
-        }
-        console.log(`Downloading and extracting from: ${sdkUrl}`);
-        await (0, unzip_url_1.unzip)(sdkUrl, cmdlineToolsPath);
-        const tempToolsPath = path.join(cmdlineToolsPath, 'cmdline-tools');
-        const latestToolsPath = path.join(cmdlineToolsPath, 'latest');
-        if (fs.existsSync(tempToolsPath)) {
-            fs.renameSync(tempToolsPath, latestToolsPath);
+        if (!fs.existsSync(latestBin)) {
+            console.log(`Downloading and extracting from: ${sdkUrl} to ${androidHome}`);
+            await (0, unzip_url_1.unzip)(sdkUrl, cmdlineToolsPath);
+            const tmp_toolchain = path.join(cmdlineToolsPath, 'cmdline-tools');
+            fs.renameSync(tmp_toolchain, latestPath);
+            console.log('Android SDK extracted successfully');
         }
-        console.log('Android SDK extracted successfully');
     }
     catch (error) {
         throw new Error(`Failed to download/extract Android SDK: ${error instanceof Error ? error.message : String(error)}`);
     }
+    const sdkmanagerBinary = path.join(latestBin, 'sdkmanager');
     const sdkmanagerEnv = {
         ...process.env,
         ANDROID_HOME: androidHome,
         ANDROID_SDK_ROOT: androidHome,
-        PATH: `${androidHome}/cmdline-tools/latest/bin:${process.env.PATH}`,
+        PATH: `${latestBin}:${process.env.PATH}`,
     };
     console.log('\nAccepting Android SDK licenses...');
     try {
-        await (0, execa_1.execa)('bash', ['-c', 'yes | sdkmanager --licenses'], {
+        await (0, execa_1.execa)('bash', [
+            '-c',
+            `yes | "${sdkmanagerBinary}" --sdk_root=${androidHome} --licenses`,
+        ], {
             env: sdkmanagerEnv,
             stdio: 'inherit',
         });
@@ -127,8 +139,7 @@ async function setupAndroidEnvironment(options) {
         `ndk;${ndkVersion}`,
     ];
     try {
-        const componentsList = components.join(' ');
-        await (0, execa_1.execa)('bash', ['-c', `yes | sdkmanager ${componentsList}`], {
+        await (0, execa_1.execa)(sdkmanagerBinary, [`--sdk_root=${androidHome}`, ...components], {
             env: sdkmanagerEnv,
             stdio: 'inherit',
         });

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

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

package/build/fish-shell-utils.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFishImportBashExports = getFishImportBashExports;
+exports.appendFishImportScript = appendFishImportScript;
+const fs = require("fs");
+const path = require("path");
+function getFishImportBashExports() {
+    return `
+# ===== Import environment variables from .bashrc - START (2025-11-09) =====
+egrep "^export " ~/.bashrc | while read e
+	set var (echo $e | sed -E "s/^export ([A-Za-z_0-9]+)=(.*)\\$/\\1/")
+	set value (echo $e | sed -E "s/^export ([A-Za-z_0-9]+)=(.*)\\$/\\2/")
+
+	# remove surrounding quotes if existing
+	set value (echo $value | sed -E "s/^\\"(.*)\\"\\$/\\1/")
+
+	# convert Bash \${VAR} to fish {\$VAR} before eval
+	set value (printf '%s' "$value" | sed -E 's/\\$\\{([A-Za-z_][A-Za-z0-9_]*)\\}/{$\\1}/g')
+
+	if test $var = "PATH"
+		# replace ":" by spaces. this is how PATH looks for Fish
+		set value (echo $value | sed -E "s/:/ /g")
+
+		# use eval because we need to expand the value
+		eval set -xg $var $value
+
+		continue
+	end
+
+	# evaluate variables. we can use eval because we most likely just used "$var"
+	set value (eval echo $value)
+
+	#echo "set -xg '$var' '$value' (via '$e')"
+	set -xg $var $value
+end
+# ===== Import environment variables from .bashrc - END =====
+`;
+}
+function appendFishImportScript(fishConfigPath) {
+    const configDir = path.dirname(fishConfigPath);
+    if (!fs.existsSync(configDir)) {
+        fs.mkdirSync(configDir, { recursive: true });
+    }
+    const fishContent = fs.existsSync(fishConfigPath)
+        ? fs.readFileSync(fishConfigPath, 'utf-8')
+        : '';
+    if (!fishContent.includes('Import environment variables from .bashrc - START')) {
+        const fishScript = getFishImportBashExports();
+        fs.appendFileSync(fishConfigPath, fishScript);
+        console.log(`Fish import script added to: ${fishConfigPath}`);
+    }
+    else {
+        console.log(`Fish import script already exists in: ${fishConfigPath}`);
+    }
+}

package/libs/android-setup.ts

@@ -2,7 +2,8 @@ import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
 import { execa } from 'execa'
-import { unzip } from '@compilets/unzip-url'
+import { unzip } from '@gengjiawen/unzip-url'
+import { appendFishImportScript } from './fish-shell-utils'
 
 /** Android SDK configuration */
 const ANDROID_CONFIG = {
@@ -35,11 +36,12 @@ function getSdkDownloadUrl(sdkVersion: string): string {
 /** Get Android environment variables */
 function getAndroidEnvVars(androidHome: string, ndkVersion: string): string {
   return `
-# Android development environment
+# ===== Android development environment - START (2025-11-09) =====
 export ANDROID_HOME=${androidHome}
 export ANDROID_SDK_ROOT=\${ANDROID_HOME}
 export ANDROID_NDK_HOME=\${ANDROID_HOME}/ndk/${ndkVersion}
-export PATH=\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin:\${PATH}
+export PATH=\${ANDROID_HOME}/cmdline-tools/bin:\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin:\${PATH}
+# ===== Android development environment - END =====
 `
 }
 
@@ -68,13 +70,25 @@ function hasAndroidEnvVars(rcFile: string): boolean {
 
 /** Append Android environment variables to shell config */
 function appendEnvVarsToShellConfig(rcFile: string, envVars: string): void {
-  const dir = path.dirname(rcFile)
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true })
+  const shell = process.env.SHELL || ''
+  const homeDir = os.homedir()
+  const bashrcFile = path.join(homeDir, '.bashrc')
+
+  // Write to bashrc
+  if (
+    !fs.existsSync(bashrcFile) ||
+    !fs.readFileSync(bashrcFile, 'utf-8').includes('ANDROID_HOME')
+  ) {
+    fs.appendFileSync(bashrcFile, envVars)
+    console.log(`Environment variables added to: ${bashrcFile}`)
+  } else {
+    console.log(`Environment variables already exist in: ${bashrcFile}`)
   }
 
-  fs.appendFileSync(rcFile, envVars)
-  console.log(`Environment variables added to: ${rcFile}`)
+  // For fish shell, always write to bashrc first, then add import script to fish config
+  if (shell.includes('fish')) {
+    appendFishImportScript(rcFile)
+  }
 }
 
 /** Setup Android development environment */
@@ -123,46 +137,49 @@ export async function setupAndroidEnvironment(options?: {
   console.log('\nDownloading and setting up Android SDK...')
   const sdkUrl = getSdkDownloadUrl(sdkVersion)
 
-  try {
-    // Create cmdline-tools directory
-    const cmdlineToolsPath = path.join(androidHome, 'cmdline-tools')
-    if (!fs.existsSync(cmdlineToolsPath)) {
-      fs.mkdirSync(cmdlineToolsPath, { recursive: true })
-    }
+  const cmdlineToolsPath = path.join(androidHome, 'cmdline-tools')
+  const latestPath = path.join(cmdlineToolsPath, 'latest')
+  const latestBin = path.join(latestPath, 'bin')
 
+  try {
     // Download and extract SDK using unzip-url
-    console.log(`Downloading and extracting from: ${sdkUrl}`)
-    await unzip(sdkUrl, cmdlineToolsPath)
-
-    // Move cmdline-tools to latest
-    const tempToolsPath = path.join(cmdlineToolsPath, 'cmdline-tools')
-    const latestToolsPath = path.join(cmdlineToolsPath, 'latest')
-    if (fs.existsSync(tempToolsPath)) {
-      fs.renameSync(tempToolsPath, latestToolsPath)
+    if (!fs.existsSync(latestBin)) {
+      console.log(
+        `Downloading and extracting from: ${sdkUrl} to ${androidHome}`
+      )
+      await unzip(sdkUrl, cmdlineToolsPath)
+      const tmp_toolchain = path.join(cmdlineToolsPath, 'cmdline-tools')
+      fs.renameSync(tmp_toolchain, latestPath)
+      console.log('Android SDK extracted successfully')
     }
-
-    console.log('Android SDK extracted successfully')
   } catch (error) {
     throw new Error(
       `Failed to download/extract Android SDK: ${error instanceof Error ? error.message : String(error)}`
     )
   }
+  const sdkmanagerBinary = path.join(latestBin, 'sdkmanager')
 
-  // Set environment variables for sdkmanager
   const sdkmanagerEnv = {
     ...process.env,
     ANDROID_HOME: androidHome,
     ANDROID_SDK_ROOT: androidHome,
-    PATH: `${androidHome}/cmdline-tools/latest/bin:${process.env.PATH}`,
+    PATH: `${latestBin}:${process.env.PATH}`,
   }
 
   // Accept licenses
   console.log('\nAccepting Android SDK licenses...')
   try {
-    await execa('bash', ['-c', 'yes | sdkmanager --licenses'], {
-      env: sdkmanagerEnv,
-      stdio: 'inherit',
-    })
+    await execa(
+      'bash',
+      [
+        '-c',
+        `yes | "${sdkmanagerBinary}" --sdk_root=${androidHome} --licenses`,
+      ],
+      {
+        env: sdkmanagerEnv,
+        stdio: 'inherit',
+      }
+    )
   } catch (error) {
     console.warn(
       'Warning: License acceptance may have failed, but continuing...'
@@ -180,11 +197,14 @@ export async function setupAndroidEnvironment(options?: {
   ]
 
   try {
-    const componentsList = components.join(' ')
-    await execa('bash', ['-c', `yes | sdkmanager ${componentsList}`], {
-      env: sdkmanagerEnv,
-      stdio: 'inherit',
-    })
+    await execa(
+      sdkmanagerBinary,
+      [`--sdk_root=${androidHome}`, ...components],
+      {
+        env: sdkmanagerEnv,
+        stdio: 'inherit',
+      }
+    )
     console.log('Android SDK components installed successfully')
   } catch (error) {
     throw new Error(

package/libs/fish-shell-utils.ts

@@ -0,0 +1,64 @@
+import * as fs from 'fs'
+import * as path from 'path'
+
+/** Get Fish shell script to import bash exports */
+export function getFishImportBashExports(): string {
+  return `
+# ===== Import environment variables from .bashrc - START (2025-11-09) =====
+egrep "^export " ~/.bashrc | while read e
+	set var (echo $e | sed -E "s/^export ([A-Za-z_0-9]+)=(.*)\\$/\\1/")
+	set value (echo $e | sed -E "s/^export ([A-Za-z_0-9]+)=(.*)\\$/\\2/")
+
+	# remove surrounding quotes if existing
+	set value (echo $value | sed -E "s/^\\"(.*)\\"\\$/\\1/")
+
+	# convert Bash \${VAR} to fish {\$VAR} before eval
+	set value (printf '%s' "$value" | sed -E 's/\\$\\{([A-Za-z_][A-Za-z0-9_]*)\\}/{$\\1}/g')
+
+	if test $var = "PATH"
+		# replace ":" by spaces. this is how PATH looks for Fish
+		set value (echo $value | sed -E "s/:/ /g")
+
+		# use eval because we need to expand the value
+		eval set -xg $var $value
+
+		continue
+	end
+
+	# evaluate variables. we can use eval because we most likely just used "$var"
+	set value (eval echo $value)
+
+	#echo "set -xg '$var' '$value' (via '$e')"
+	set -xg $var $value
+end
+# ===== Import environment variables from .bashrc - 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
+ */
+export function appendFishImportScript(fishConfigPath: string): void {
+  // Ensure fish config directory exists
+  const configDir = path.dirname(fishConfigPath)
+  if (!fs.existsSync(configDir)) {
+    fs.mkdirSync(configDir, { recursive: true })
+  }
+
+  // Check if import script already exists
+  const fishContent = fs.existsSync(fishConfigPath)
+    ? fs.readFileSync(fishConfigPath, 'utf-8')
+    : ''
+
+  if (
+    !fishContent.includes('Import environment variables from .bashrc - START')
+  ) {
+    const fishScript = getFishImportBashExports()
+    fs.appendFileSync(fishConfigPath, fishScript)
+    console.log(`Fish import script added to: ${fishConfigPath}`)
+  } else {
+    console.log(`Fish import script already exists in: ${fishConfigPath}`)
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gengjiawen/os-init",
   "private": false,
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -19,7 +19,7 @@
     "postbuild": "cpy '**/*' '!**/*.ts' ../build/ --cwd=libs --parents"
   },
   "dependencies": {
-    "@compilets/unzip-url": "^1.0.0",
+    "@gengjiawen/unzip-url": "^1.0.0",
     "commander": "^12.1.0",
     "ip": "^2.0.1",
     "execa": "^8.0.1"