Merge pull request #37 from stevenlei/feat/improve-pkgx-detection

undefined
teaxyz · Dec 31, 2024 · 9d5e6f5 · 9d5e6f5
2 parents 20448be + 90e67bc
commit 9d5e6f5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Sources/teaBASE+Helpers.m b/Sources/teaBASE+Helpers.m
@@ -65,8 +65,18 @@ - (BOOL)homebrewInstalled {
 }
 
 - (BOOL)pkgxInstalled {
-    //TODO need to check more locations
-    return [NSFileManager.defaultManager isReadableFileAtPath:@"/usr/local/bin/pkgx"];
+    NSArray *locations = @[
+        @"/usr/local/bin/pkgx", // system-wide
+        [NSString stringWithFormat:@"%@/.local/bin/pkgx", NSHomeDirectory()] // user-specific
+    ];
+
+    NSFileManager *fm = NSFileManager.defaultManager;
+    for (NSString *path in locations) {
+        if ([fm isExecutableFileAtPath:path]) {
+            return YES;
+        }
+    }
+    return NO;
 }
 
 - (IBAction)modalCancel:(NSButton *)sender {