kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[F] Make psutil dependency Windows-only

Browse source
This commit is contained in:
Azalea (on HyDEV-Daisy) 2022-08-30 18:34:30 -04:00
parent 1456660797
commit a8352d1fef
No known key found for this signature in database
GPG key ID: E289FAC0DA92DD2B
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
hyfetch/neofetch_util.py
View file

@ -14,7 +14,6 @@ from tempfile import TemporaryDirectory
from urllib.request import urlretrieve from urllib.request import urlretrieve
import pkg_resources import pkg_resources
import psutil
from typing_extensions import Literal from typing_extensions import Literal
from hyfetch.color_util import color from hyfetch.color_util import color
@ -185,11 +184,13 @@ def check_windows_cmd():
Check if this script is running under cmd.exe. If so, launch an external window with git bash Check if this script is running under cmd.exe. If so, launch an external window with git bash
since cmd doesn't support RGB colors. since cmd doesn't support RGB colors.
""" """
if psutil.Process(os.getppid()).name().lower().strip() == 'cmd.exe': if platform.system() == 'Windows':
print("cmd.exe doesn't support RGB colors, restarting in MinTTY...") import psutil
cmd = f'"{ensure_git_bash().parent.parent / "usr/bin/mintty.exe"}" -s 110,40 -e python -m hyfetch --ask-exit' if psutil.Process(os.getppid()).name().lower().strip() == 'cmd.exe':
os.system(cmd) print("cmd.exe doesn't support RGB colors, restarting in MinTTY...")
exit() cmd = f'"{ensure_git_bash().parent.parent / "usr/bin/mintty.exe"}" -s 110,40 -e python -m hyfetch --ask-exit'
os.system(cmd)
exit()
def run_command(args: str, pipe: bool = False) -> str | None: def run_command(args: str, pipe: bool = False) -> str | None:

8
setup.py
View file

@ -33,7 +33,13 @@ setup(
packages=['hyfetch'], packages=['hyfetch'],
package_data={'hyfetch': ['hyfetch/*']}, package_data={'hyfetch': ['hyfetch/*']},
include_package_data=True, include_package_data=True,
install_requires=['setuptools', 'typing_extensions'], install_requires=[
# Universal dependencies
'setuptools', 'typing_extensions'
# Windows dependencies
'psutil ; platform_system=="Windows"'
],
entry_points={ entry_points={
"console_scripts": [ "console_scripts": [
"hyfetch=hyfetch.main:run", "hyfetch=hyfetch.main:run",