From b3c033cc0cc0e47558bf3a37692948443f991e26 Mon Sep 17 00:00:00 2001 From: Trey Blancher Date: Sun, 24 Dec 2023 03:12:53 -0500 Subject: [PATCH] First toggle_remote.sh commit --- toggle_remote.sh | 13 +++++++------ vim/syntax/README.md | 34 +--------------------------------- vim/syntax/timetracker.vim | 6 +++--- 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/toggle_remote.sh b/toggle_remote.sh index 320396d..92d623e 100755 --- a/toggle_remote.sh +++ b/toggle_remote.sh @@ -2,14 +2,15 @@ readme=$(grep vim/syntax/README.md .gitignore) -if [[ "${readme}" =~ ^# ]]; then # we're switching to git.eldon.me - mv vim/syntax/timetracker.vim{,.tmp} - mv vim/syntax/timetracker.vim{.hide,} - /Users/tblancher/homebrew/bin/sed -Ei \ - 's,^(vim/syntax/README.md),#\1,;s,^(toggle_remote.sh),#\1,' .gitignore -else # we're switching to Pindrop GitHub +if [[ "${readme}" =~ ^# ]]; then # we're switching to Pindrop GitHub mv vim/syntax/timetracker.vim{,.hide} mv vim/syntax/timetracker.vim{.tmp,} /Users/tblancher/homebrew/bin/sed -Ei \ 's,^#(vim/syntax/README.md),\1,;s,^#(toggle_remote.sh),\1,' .gitignore + git rm --cached toggle_remote.sh vim/syntax/README.md +else # we're switching to git.eldon.me + mv vim/syntax/timetracker.vim{,.tmp} + mv vim/syntax/timetracker.vim{.hide,} + /Users/tblancher/homebrew/bin/sed -Ei \ + 's,^(vim/syntax/README.md),#\1,;s,^(toggle_remote.sh),#\1,' .gitignore fi diff --git a/vim/syntax/README.md b/vim/syntax/README.md index 0a0272d..4fc0a1c 100644 --- a/vim/syntax/README.md +++ b/vim/syntax/README.md @@ -6,36 +6,4 @@ customers (or other important entities). Since this information is sensitive, I am sanitizing it before I post it to my personal, public-facing Git repo on git.eldon.me. -I haven't figured out a better way to do this in Git, but before I commit it I -will change the following lines in _~/timetracker/.gitignore_ from this: - -``` -vim/syntax/README.md -vim/syntax/timetracker.vim.hide -vim/syntax/timetracker.vim.tmp -``` - -To this: - -``` -#vim/syntax/README.md -vim/syntax/timetracker.vim.hide -vim/syntax/timetracker.vim.tmp -``` - -And then rename _vim/syntax/timetracker.vim_ to -_vim/syntax/timetracker.vim.tmp_, and rename _vim/syntax/timetracker.vim.hide_ -to _vim/syntax/timetracker.vim_: - -``` -mv vim/syntax/timetracker.vim{,.tmp} -mv vim/syntax/timetracker.vim{.hide,} -``` - -Commit and push the changes, then revert _.gitignore_ and -_vim/syntax/timetracker.vim_: - -``` -mv vim/syntax/timetracker.vim{,.hide} -mv vim/syntax/timetracker.vim{.tmp,} -``` +Just run `./toggle_remote.sh` and it should do the right thing. diff --git a/vim/syntax/timetracker.vim b/vim/syntax/timetracker.vim index 64c7d4d..bf0794f 100644 --- a/vim/syntax/timetracker.vim +++ b/vim/syntax/timetracker.vim @@ -64,9 +64,9 @@ syntax keyword timetrackerStandardOps \ verification \ voiceprint syntax keyword Customers - \ Customer1 - \ Customer2 - \ Customer3 + \ Customer1 + \ Customer2 + \ Customer3 syntax match timetrackerTimestamp /\d\{4}-\%(0[135789]-\%([0-2]\d\|3[01]\)\|\%(1[02]-\%([0-2]\d\|3[01]\)\)\|0[46]-\%([0-2]\d\|30\)\|11-\%([0-2]\d\|30\)\|02-[0-2]\d\) \%([01]\d\|2[0-3]\):\%([0-5]\d\)\%(:[0-5]\d\)\{2}/ contained "syntax match ticket /\(#|CM-|PD-\)\d\+/