From 533f2822d90bb79225a940739da37de885de1a71 Mon Sep 17 00:00:00 2001
From: Anthony Gress <the.techx.guy@gmail.com>
Date: Sun, 12 May 2024 00:27:23 -0400
Subject: [PATCH] update paths for local dev, fix smarttube link

---
 .gitignore                  |  1 +
 release/app/package.json    |  2 +-
 src/main/constants/index.ts | 34 +++++++++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e0d741..ba65e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ npm-debug.log.*
 package-lock.json
 .vscode
 .idea
+apks
diff --git a/release/app/package.json b/release/app/package.json
index 8671b99..b5c177c 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "android-toolkit",
-  "version": "1.5.22",
+  "version": "1.5.23",
   "description": "Universal app with gui for simple adb connection",
   "main": "./dist/main/main.js",
   "author": {
diff --git a/src/main/constants/index.ts b/src/main/constants/index.ts
index 56b6bbf..9f41de9 100644
--- a/src/main/constants/index.ts
+++ b/src/main/constants/index.ts
@@ -1,8 +1,8 @@
-export const POWERSHELL_CMD = 'start powershell -noexit -command "[console]::windowwidth=80; [console]::windowheight=35; [console]::bufferwidth=[console]::windowwidth; cd .\\platform-tools; Get-Content -Raw ..\\resources\\assets\\art.txt; Write-Host "Run ADB commands here" -nonewline; Write-Host "`n";Write-Host "Ex: .\\adb COMMAND"; Write-Host "`n""';
+import { exec } from 'child_process';
 
-export const TERMINAL_CMD = 'open -a Terminal /Applications/"Android Toolkit.app"/Contents/platform-tools';
+export const POWERSHELL_CMD = 'start powershell -noexit -command "[console]::windowwidth=80; [console]::windowheight=35; [console]::bufferwidth=[console]::windowwidth; cd .\\platform-tools; Get-Content -Raw ..\\resources\\assets\\art.txt; Write-Host "Run ADB commands here" -nonewline; Write-Host "`n";Write-Host "Ex: .\\adb COMMAND"; Write-Host "`n""';
 
-export const SMART_TUBE_URL = 'https://github.com/yuliskov/SmartTube/releases/download/21.54s/SmartTube_stable_21.54_armeabi-v7a.apk';
+export const SMART_TUBE_URL = 'https://github.com/yuliskov/SmartTube/releases/download/21.82/SmartTube_beta_21.82_armeabi-v7a.apk';
 
 export const INFINITY_REDDIT_URL = 'https://github.com/KhoalaS/Infinity-For-Reddit/releases/latest/download/app-release.apk';
 
@@ -37,15 +37,34 @@ export const IS_WIN = process.platform === 'win32';
 export const USERNAME= process.env.USERNAME;
 export const WINDOWS_RESOURCE_PATH = `C:\\Users\\${USERNAME}\\AppData\\Local\\Programs\\android-toolkit\\resources`;
 
+
+const getAdbPath = () => {
+    console.log('using dev adb path');
+
+    let path = '';
+    exec('which adb', (error, stdout, stderr) => {
+        if (error) {
+            console.error(`exec error: ${error}`);
+            console.log(stderr);
+            return;
+        }
+        path = stdout.toString();
+    });
+    return path;
+};
+
+export const isDevelopment = process.env.NODE_ENV === 'development';
 export let APK_PATH: string;
 export let ADB_PATH: string;
+export let TERMINAL_CMD: string;
 export const USER_OS = process.platform;
 
 switch (USER_OS) {
 case 'darwin':
     console.log('MacOS');
-    APK_PATH = '/Applications/Android Toolkit.app/Contents/apks/';
-    ADB_PATH = '/Applications/"Android Toolkit.app"/Contents/platform-tools/';
+    APK_PATH = isDevelopment ? './apks' : '/Applications/Android Toolkit.app/Contents/apks/';
+    ADB_PATH = isDevelopment ? getAdbPath() : '/Applications/"Android Toolkit.app"/Contents/platform-tools/';
+    TERMINAL_CMD = 'open -a Terminal /Applications/"Android Toolkit.app"/Contents/platform-tools';
     break;
 
 case 'win32':
@@ -56,8 +75,9 @@ case 'win32':
 
 case 'linux':
     console.log('Linux operating system');
-    APK_PATH = '/usr/bin/Android-Toolkit/apks/';
-    ADB_PATH = '/usr/bin/Android-Toolkit/platform-tools/';
+    APK_PATH = isDevelopment ? './apks' : '/usr/bin/Android-Toolkit/apks/';
+    ADB_PATH = isDevelopment ? getAdbPath() : '/usr/bin/Android-Toolkit/platform-tools/';
+    TERMINAL_CMD = isDevelopment ? 'x-terminal-emulator' : 'x-terminal-emulator -w /usr/bin/Android-Toolkit/platform-tools/';
     break;
 
 default: