diff options
| author | Hsieh Chin Fan <typebrook@topo.tw> | 2022-12-18 17:48:18 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <typebrook@topo.tw> | 2022-12-18 17:48:18 +0800 |
| commit | 61ca7a63deef169d78ab5b0076a8796ec06bb9e3 (patch) | |
| tree | 13cc3bd72e45fc693f55c37d58ab75a71519c214 /tools | |
| parent | c6f959b4a3f804c62b5d2ad86385ba7173e1b5ee (diff) | |
| parent | e4613c3620d6cbc4b0b535f4f95913c677036d24 (diff) | |
Merge remote-tracking branch 'origin/dev' into dev
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/git/check-repos.sh | 2 | ||||
| -rwxr-xr-x | tools/wiki/diary | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/git/check-repos.sh b/tools/git/check-repos.sh index e6f3b6c..5180fc9 100755 --- a/tools/git/check-repos.sh +++ b/tools/git/check-repos.sh | |||
| @@ -28,7 +28,7 @@ while read repo remote; do | |||
| 28 | changes="$(git -c color.status=always status --short)" | 28 | changes="$(git -c color.status=always status --short)" |
| 29 | 29 | ||
| 30 | # Diff between from local repo and remote | 30 | # Diff between from local repo and remote |
| 31 | cherry="$(git cherry)" | 31 | cherry="$([ -n "`git remote`" ] && git cherry)" |
| 32 | 32 | ||
| 33 | if [[ $COUNT_ONLY == true ]]; then | 33 | if [[ $COUNT_ONLY == true ]]; then |
| 34 | # If '-n' is specified, only count repo with changes/local-diff | 34 | # If '-n' is specified, only count repo with changes/local-diff |
diff --git a/tools/wiki/diary b/tools/wiki/diary index ce7a5be..3995ecf 100755 --- a/tools/wiki/diary +++ b/tools/wiki/diary | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #! /bin/bash | 1 | #! /bin/bash |
| 2 | 2 | ||
| 3 | today=~/log/diary/$(date --iso-8601).md | 3 | today=~/log/`date +%y.w%W.md` |
| 4 | 4 | ||
| 5 | specify_date() { | 5 | specify_date() { |
| 6 | YEAR=${YEAR:-22} | 6 | YEAR=${YEAR:-22} |