mirror of
https://github.com/dylanaraps/pywal.git
synced 2024-11-29 11:24:03 +01:00
reload: Fix error with XQuartz on macOS. Closes #86
This commit is contained in:
parent
270de570dd
commit
dad1736fce
@ -7,7 +7,7 @@ import shutil
|
|||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from .settings import CACHE_DIR, HOME, MODULE_DIR
|
from .settings import CACHE_DIR, HOME, MODULE_DIR, OS
|
||||||
from . import util
|
from . import util
|
||||||
|
|
||||||
|
|
||||||
@ -15,7 +15,7 @@ def xrdb(xrdb_file=None):
|
|||||||
"""Merge the colors into the X db so new terminals use them."""
|
"""Merge the colors into the X db so new terminals use them."""
|
||||||
xrdb_file = xrdb_file or os.path.join(CACHE_DIR, "colors.Xresources")
|
xrdb_file = xrdb_file or os.path.join(CACHE_DIR, "colors.Xresources")
|
||||||
|
|
||||||
if shutil.which("xrdb"):
|
if shutil.which("xrdb") or OS != "Darwin":
|
||||||
subprocess.Popen(["xrdb", "-merge", xrdb_file],
|
subprocess.Popen(["xrdb", "-merge", xrdb_file],
|
||||||
stdout=subprocess.DEVNULL,
|
stdout=subprocess.DEVNULL,
|
||||||
stderr=subprocess.DEVNULL).wait()
|
stderr=subprocess.DEVNULL).wait()
|
||||||
|
Loading…
Reference in New Issue
Block a user