Add WSL support and fix config formatting
This commit is contained in:
59
bin/dotf
59
bin/dotf
@@ -5,10 +5,12 @@ import signal
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
def signal_handler(sig, frame):
|
||||
print('Exiting.')
|
||||
print("Exiting.")
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
signal.signal(signal.SIGINT, signal_handler)
|
||||
|
||||
# Script constants
|
||||
@@ -22,43 +24,54 @@ from helpers.functions import printfe, ensure_dependencies
|
||||
|
||||
ensure_dependencies()
|
||||
|
||||
|
||||
def run_script(script_path, args):
|
||||
"""Run an action script with the given arguments"""
|
||||
if not os.path.isfile(script_path) or not os.access(script_path, os.X_OK):
|
||||
printfe("red", f"Error: Script not found or not executable: {script_path}")
|
||||
return 1
|
||||
|
||||
result = subprocess.run([script_path] + args, env={**os.environ, "DOTFILES_PATH": DOTFILES_PATH})
|
||||
result = subprocess.run(
|
||||
[script_path] + args, env={**os.environ, "DOTFILES_PATH": DOTFILES_PATH}
|
||||
)
|
||||
return result.returncode
|
||||
|
||||
|
||||
def update(args):
|
||||
"""Run the update action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/update.py", args)
|
||||
|
||||
|
||||
def hello(args):
|
||||
"""Run the hello action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/hello.py", args)
|
||||
|
||||
|
||||
def help(args):
|
||||
"""Run the help action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/help.py", args)
|
||||
|
||||
|
||||
def service(args):
|
||||
"""Run the service/docker action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/service.py", args)
|
||||
|
||||
|
||||
def lint(args):
|
||||
"""Run the lint action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/lint.py", args)
|
||||
|
||||
|
||||
def timers(args):
|
||||
"""Run the timers action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/timers.py", args)
|
||||
|
||||
|
||||
def source(args):
|
||||
"""Run the source action"""
|
||||
return run_script(f"{DOTFILES_BIN}/actions/source.py", args)
|
||||
|
||||
|
||||
def ensure_git_hooks():
|
||||
"""Ensure git hooks are correctly set up"""
|
||||
hooks_dir = os.path.join(DOTFILES_ROOT, ".git/hooks")
|
||||
@@ -66,14 +79,19 @@ def ensure_git_hooks():
|
||||
|
||||
# Validate target directory exists
|
||||
if not os.path.isdir(target_link):
|
||||
printfe("red", f"Error: Git hooks source directory does not exist: {target_link}")
|
||||
printfe(
|
||||
"red", f"Error: Git hooks source directory does not exist: {target_link}"
|
||||
)
|
||||
return 1
|
||||
|
||||
# Handle existing symlink
|
||||
if os.path.islink(hooks_dir):
|
||||
current_link = os.readlink(hooks_dir)
|
||||
if current_link != target_link:
|
||||
printfe("yellow", "Incorrect git hooks symlink found. Removing and recreating...")
|
||||
printfe(
|
||||
"yellow",
|
||||
"Incorrect git hooks symlink found. Removing and recreating...",
|
||||
)
|
||||
os.remove(hooks_dir)
|
||||
else:
|
||||
return 0
|
||||
@@ -82,6 +100,7 @@ def ensure_git_hooks():
|
||||
if os.path.isdir(hooks_dir) and not os.path.islink(hooks_dir):
|
||||
printfe("yellow", "Removing existing hooks directory...")
|
||||
import shutil
|
||||
|
||||
shutil.rmtree(hooks_dir)
|
||||
|
||||
# Create new symlink
|
||||
@@ -93,6 +112,7 @@ def ensure_git_hooks():
|
||||
printfe("red", f"Failed to create git hooks symlink: {e}")
|
||||
return 1
|
||||
|
||||
|
||||
def main():
|
||||
# Ensure we're in the correct directory
|
||||
if not os.path.isdir(DOTFILES_ROOT):
|
||||
@@ -114,13 +134,42 @@ def main():
|
||||
"service": service,
|
||||
"lint": lint,
|
||||
"timers": timers,
|
||||
"source": source
|
||||
"source": source,
|
||||
}
|
||||
|
||||
if command in commands:
|
||||
return commands[command](args)
|
||||
else:
|
||||
# For invalid commands, show error after logo
|
||||
if command != "help":
|
||||
from helpers.functions import logo
|
||||
|
||||
logo(continue_after=True)
|
||||
print()
|
||||
printfe("red", f"✗ Error: Unknown command '{command}'")
|
||||
|
||||
# Provide helpful hints for common mistakes
|
||||
if command == "ls":
|
||||
printfe("yellow", " Hint: Did you mean 'dotf service ls'?")
|
||||
elif command == "list":
|
||||
printfe("yellow", " Hint: Did you mean 'dotf service list'?")
|
||||
|
||||
print()
|
||||
# Now print help text without logo
|
||||
dotfiles_path = os.environ.get(
|
||||
"DOTFILES_PATH", os.path.expanduser("~/.dotfiles")
|
||||
)
|
||||
try:
|
||||
with open(
|
||||
f"{dotfiles_path}/bin/resources/help.txt", "r", encoding="utf-8"
|
||||
) as f:
|
||||
print(f.read())
|
||||
except OSError as e:
|
||||
printfe("red", f"Error reading help file: {e}")
|
||||
return 1
|
||||
return 1
|
||||
return help([])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
|
||||
Reference in New Issue
Block a user