alee/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auto-sync from catchthesethighs

Browse Source
This commit is contained in:
Aaron D. Lee
2025-12-15 21:39:56 -05:00
parent 9673a1cb94
commit 3560a94418
7 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/dotfiles-sync.sh
View File

@@ -319,13 +319,13 @@ do_auto() {
if [[ $behind -gt 0 ]]; then
echo -e "${YELLOW}⚠ Dotfiles: $behind update(s) available${NC}"
echo -e " Run: ${CYAN}dotfiles-sync.sh --pull${NC}"
echo -e " Run: ${CYAN}dfpull${NC} or ${CYAN}dotfiles-sync.sh --pull${NC}"
fi
if has_local_changes; then
local changed=$(git status --short 2>/dev/null | wc -l | tr -d ' ')
echo -e "${YELLOW}⚠ Dotfiles: $changed local change(s) not pushed${NC}"
echo -e " Run: ${CYAN}dotfiles-sync.sh --push${NC}"
echo -e " Run: ${CYAN}dfpush${NC} or ${CYAN}dotfiles-sync.sh --push${NC}"
fi
}
@@ -382,7 +382,7 @@ show_conflicts() {
# ============================================================================
show_help() {
echo "Usage: $0 [COMMAND] [OPTIONS]"
echo "Usage: dotfiles-sync.sh [COMMAND] [OPTIONS]"
echo
echo "Commands:"
echo " (none) Interactive sync"
@@ -396,10 +396,17 @@ show_help() {
echo " --conflicts Show merge conflicts"
echo " --help Show this help"
echo
echo "Aliases:"
echo " dfs, dfsync Interactive sync"
echo " dfpush Push local changes"
echo " dfpull Pull remote changes"
echo " dfstatus Show sync status"
echo
echo "Examples:"
echo " $0 # Interactive sync"
echo " $0 --push 'Added aliases' # Push with message"
echo " $0 --watch 60 # Sync every 60 seconds"
echo " dfs # Interactive sync"
echo " dfpush # Push changes"
echo " dotfiles-sync.sh --push 'Added aliases'"
echo " dotfiles-sync.sh --watch 60 # Sync every 60 seconds"
echo
}