summaryrefslogtreecommitdiff
path: root/pywal
diff options
context:
space:
mode:
authorDylan Araps <dylan.araps@gmail.com>2018-02-01 11:53:43 +1100
committerDylan Araps <dylan.araps@gmail.com>2018-02-01 11:53:43 +1100
commitc0fd6deff2f88544cd492ca01fadf70118d78e5f (patch)
treed5c805a93e37594f351e1f4c9791611540659622 /pywal
parenta671152ff59f483649c98d6d7334fa19f0174a7c (diff)
theme: Don't use oomox by default. -g now does the inverse.
Diffstat (limited to 'pywal')
-rw-r--r--pywal/__main__.py6
-rw-r--r--pywal/reload.py14
2 files changed, 13 insertions, 7 deletions
diff --git a/pywal/__main__.py b/pywal/__main__.py
index 43d438e..283b47f 100644
--- a/pywal/__main__.py
+++ b/pywal/__main__.py
@@ -46,7 +46,7 @@ def get_args(args):
help="Which colorscheme file to use.")
arg.add_argument("-g", action="store_true",
- help="Skip generating oomox theme.")
+ help="Generate an oomox theme.")
arg.add_argument("-n", action="store_true",
help="Skip setting the wallpaper.")
@@ -146,8 +146,8 @@ def process_args(args):
if args.o:
util.disown([args.o])
- if not args.e and not args.g:
- reload.oomox()
+ if not args.e:
+ reload.oomox(args.g)
reload.gtk()
diff --git a/pywal/reload.py b/pywal/reload.py
index 6b2f1bb..9426cfb 100644
--- a/pywal/reload.py
+++ b/pywal/reload.py
@@ -28,16 +28,22 @@ def xrdb(xrdb_files=None):
subprocess.run(["xrdb", "-merge", "-nocpp", file])
-def oomox():
+def oomox(gen_theme):
"""Call oomox to generate a theme."""
- oomox_file = os.path.join(CACHE_DIR, "colors-oomox")
+ if gen_theme:
+ if not shutil.which("oomox-cli"):
+ print("gtk: oomox not found, skipping...")
+ return
+
+ oomox_file = os.path.join(CACHE_DIR, "colors-oomox")
- if shutil.which("oomox-cli"):
print("reload: Waiting for oomox...")
- print("reload: Use -g to skip running oomox.")
subprocess.run(["oomox-cli", "-o", "wal", oomox_file],
stdout=subprocess.DEVNULL)
+ else:
+ print("gtk: Use -g to generate an oomox theme.")
+
def gtk():
"""Reload GTK theme on the fly."""