fix: correctly determine ANDROID_HOME (#10) (#11)

* fix: correctly determine ANDROID_HOME

package.json

@@ -1,7 +1,7 @@
 {
   "name": "emu",
   "private": true,
-  "version": "0.2.2",
+  "version": "0.2.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "emu"
-version = "0.2.2"
+version = "0.2.3"
 description = "Manage emulators with ease"
 authors = ["fax1ty"]
 edition = "2021"

src-tauri/src/lib.rs

@@ -9,12 +9,6 @@ use tauri::{
 };
 use tauri_plugin_positioner::{Position, WindowExt};
 
-#[tauri::command]
-fn get_android_home() -> Result<String, String> {
-    let v = env::var("ANDROID_HOME").map_err(|err| err.to_string())?;
-    Ok(v)
-}
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
@@ -27,7 +21,6 @@ pub fn run() {
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_shell::init())
-        .invoke_handler(tauri::generate_handler![get_android_home])
         .setup(|app| {
             let aligned = Arc::new(Mutex::new(false));
 

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "emu",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "identifier": "emu.app",
   "build": {
     "beforeDevCommand": "bun run dev",

src/components/modals/device-options.tsx

@@ -28,7 +28,7 @@ export const DeivceOptionsModal = () => {
     if (!deviceOptionsInfo) return;
 
     setDeviceOptionsModalVisible(false);
-    await startEmulator(deviceOptionsInfo.name);
+    await startEmulator(deviceOptionsInfo.name, true);
   };
 
   const onClose = () => {

src/queries/emulator.ts

@@ -1,7 +1,10 @@
-import { invoke } from "@tauri-apps/api/core";
 import useSWR, { useSWRConfig } from "swr";
 
-import { getAllEmulators, getOnlineEmulators } from "@/services/api/emulator";
+import {
+  getAllEmulators,
+  getAndroidHome,
+  getOnlineEmulators,
+} from "@/services/api/emulator";
 import { useAppStore } from "@/stores/app";
 import { useModalsStore } from "@/stores/modals";
 import { Device } from "@/types/device";
@@ -34,7 +37,7 @@ export const useEmulators = () => {
     disabled ? null : "emulators",
     async () => {
       try {
-        await invoke<string>("get_android_home");
+        await getAndroidHome();
       } catch (error) {
         const { isDangerModeEnabled } = useAppStore.getState();
         if (!isDangerModeEnabled) setAndroidHomeModalVisible(true);

src/services/api/emulator.ts

@@ -1,4 +1,4 @@
-import { adb, emulator } from "@/services/execute";
+import { adb, emulator, printenv } from "@/services/execute";
 import { Device, DeviceState, DeviceType } from "@/types/device";
 
 export const getAllEmulators = async () => {
@@ -104,3 +104,7 @@ export const startEmulator = async (name: string, cold = false) => {
 export const stopEmulator = async (id: string) => {
   await adb(`-s ${id} emu kill`);
 };
+
+export const getAndroidHome = () => {
+  return printenv("ANDROID_HOME");
+};

src/services/execute.ts

@@ -58,3 +58,17 @@ export const adb = (command: string) => {
 export const simctl = (command: string) => {
   return execute("xcrun simctl", command);
 };
+
+export const printenv = async (name: string) => {
+  const currentPlatfrom = platform();
+
+  switch (currentPlatfrom) {
+    case "windows":
+      const variable = await execute("echo", `%${name}%`);
+      if (variable === `%${name}%`) throw new Error("Variable is not found");
+      return variable;
+
+    default:
+      return execute("printenv", name);
+  }
+};