From 37545eaf5386475a3380dac3819170ad7d250009 Mon Sep 17 00:00:00 2001
From: developomp <developomp@gmail.com>
Date: Fri, 6 May 2022 18:59:32 +0900
Subject: [PATCH] fixed `command_exists` always returning True

---
 setup.py    |  4 ++--
 src/util.py | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 67a53e4..db1f315 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ This file is all that's needed for execution.
 It'll download all the dependencies and related files automatically.
 """
 
-from os import system, geteuid
+from os import system, geteuid, popen
 from os.path import exists
 from shutil import rmtree
 import sys
@@ -21,7 +21,7 @@ tmp_dir = "/tmp/com.developomp.setup"
 
 
 def command_exits(command: str) -> bool:
-    return system(f"command -v {command} &> /dev/null") == 0
+    return len(popen(f"command -v {command}").readlines()) == 1
 
 
 #
diff --git a/src/util.py b/src/util.py
index 1f8db0a..f46e584 100644
--- a/src/util.py
+++ b/src/util.py
@@ -1,5 +1,5 @@
 from importlib.machinery import SourceFileLoader
-from os import system, makedirs
+from os import system, makedirs, popen
 from os.path import dirname
 import requests
 import zipfile
@@ -107,15 +107,26 @@ def import_file(name, path):
     return SourceFileLoader(name, path).load_module()
 
 
-def zsh_system(command: str):
+def zsh_system(command: str) -> None:
     """os.system but uses zsh.
-    The command should not contain a single quote (') that's not escaped."""
+    The command should not contain a single quote (') that's not escaped.
+    Use this if the command has output you want to display in real time."""
 
     system(f"/usr/bin/zsh -c '{command}'")
 
 
+def run(command: str) -> list[str]:
+    """Runs command in system shell and return the result.
+    This is a blocking function.
+    Use this if you want to get the output of the command."""
+
+    return popen(command).readlines()
+
+
 def command_exists(command: str) -> bool:
-    return system(f"command -v {command} &> /dev/null") == 0
+    """Check if a command can be found in the current default shell."""
+
+    return len(run(f"command -v {command}")) == 1
 
 
 """