diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-05-29 14:46:11 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-05-29 14:46:11 +1200 |
commit | 05766d5bf46c8c3fecb3858daa796af917852dbd (patch) | |
tree | f6fce5bc867fb031862165b25440c4312caec5dc | |
parent | Merge branch 'release/v5.3.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-05766d5bf46c8c3fecb3858daa796af917852dbd.tar.gz dotfiles-05766d5bf46c8c3fecb3858daa796af917852dbd.zip |
Merge branch 'release/v5.4.0'v5.4.0
* release/v5.4.0:
Bump VERSION
Add check and lint targets for git template hooks
Add first attempt at Git template dir
Remove mapping loop from normal CTRL-L in vimrc
Update vim-sahara to v1.4.0
Adjust insert mode CTRL-L mapping
Compact 'wildignore' setting a bit
Update vim-vertical-region to v1.3.0
Use :map then :sunmap to abbreviate nox mappings
Update vim-colon-operator to v0.5.0
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 22 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | check/git-template-hooks.sh | 3 | ||||
-rw-r--r-- | git/template/description | 1 | ||||
-rw-r--r-- | git/template/hooks/post-update.sh | 4 | ||||
-rw-r--r-- | lint/git-template-hooks.sh | 5 | ||||
m--------- | vim/bundle/colon_operator | 0 | ||||
m--------- | vim/bundle/sahara | 0 | ||||
m--------- | vim/bundle/vertical_region | 0 | ||||
-rw-r--r-- | vim/vimrc | 20 |
11 files changed, 43 insertions, 17 deletions
@@ -170,6 +170,7 @@ /games/zs /git/gitconfig /git/gitconfig.m4 +/git/template/hooks/post-update /gnupg/gpg.conf /gnupg/gpg.conf.m4 /include/mktd.m4 @@ -65,6 +65,7 @@ check-bash \ check-bin \ check-games \ + check-git-template-hooks \ check-ksh \ check-login-shell \ check-man \ @@ -76,6 +77,7 @@ lint-bash \ lint-bin \ lint-games \ + lint-git-template-hooks \ lint-ksh \ lint-sh \ lint-urxvt \ @@ -261,7 +263,9 @@ GAMES = games/aaf \ games/xyzzy \ games/zs -all: $(BINS) git/gitconfig gnupg/gpg.conf +GIT_TEMPLATE_HOOKS = git/template/hooks/post-update + +all: $(BINS) git/gitconfig $(GIT_TEMPLATE_HOOKS) gnupg/gpg.conf clean distclean: rm -f -- \ @@ -269,6 +273,7 @@ clean distclean: $(BINS_M4) \ $(BINS_SH) \ $(GAMES) \ + $(GIT_TEMPLATE_HOOKS) \ dillo/dillorc \ dillo/dillorc.m4 \ git/gitconfig \ @@ -414,8 +419,15 @@ install-games-man: mkdir -p -- $(HOME)/.local/share/man/man6 cp -p -- man/man6/*.6df $(HOME)/.local/share/man/man6 -install-git: git/gitconfig +install-git: git/gitconfig $(GIT_TEMPLATE_HOOKS) cp -p -- git/gitconfig $(HOME)/.gitconfig + find git/template \ + -type d -exec sh -c 'mkdir -p -- \ + $(HOME)/.git-template"$${1#git/template}"' \ + _ {} \; \ + -o -exec sh -c 'cp -p -- "$$1" \ + $(HOME)/.git-template"$${1#git/template}"' \ + _ {} \; install-gnupg: gnupg/gpg.conf mkdir -m 0700 -p -- $(HOME)/.gnupg @@ -656,6 +668,9 @@ check-bin: $(BINS) check-games: $(GAMES) sh check/games.sh +check-git-template-hooks: $(GIT_TEMPLATE_HOOKS) + sh check/git-template-hooks.sh + check-man: sh check/man.sh @@ -695,6 +710,9 @@ lint-bin: check-bin lint-games: check-games sh lint/games.sh +lint-git-template-hooks: check-git-template-hooks + sh lint/git-template-hooks.sh + lint-ksh: check-ksh sh lint/ksh.sh @@ -1,2 +1,2 @@ -tejr dotfiles v5.3.0 -Wed May 29 01:30:13 UTC 2019 +tejr dotfiles v5.4.0 +Wed May 29 02:46:11 UTC 2019 diff --git a/check/git-template-hooks.sh b/check/git-template-hooks.sh new file mode 100644 index 00000000..42d3a69f --- /dev/null +++ b/check/git-template-hooks.sh @@ -0,0 +1,3 @@ +for sh in git/template/hooks/*.sh ; do + sh -n "${sh%.sh}" || exit +done diff --git a/git/template/description b/git/template/description new file mode 100644 index 00000000..9e2d17e8 --- /dev/null +++ b/git/template/description @@ -0,0 +1 @@ +I have no description, and I must scream. diff --git a/git/template/hooks/post-update.sh b/git/template/hooks/post-update.sh new file mode 100644 index 00000000..7199a513 --- /dev/null +++ b/git/template/hooks/post-update.sh @@ -0,0 +1,4 @@ +bare=$(git config core.bare) +case $bare in + true) git update-server-info ;; +esac diff --git a/lint/git-template-hooks.sh b/lint/git-template-hooks.sh new file mode 100644 index 00000000..74f20fc6 --- /dev/null +++ b/lint/git-template-hooks.sh @@ -0,0 +1,5 @@ +set -- +for bin in git/template/hooks/*.sh ; do + set -- "$@" "${bin%.sh}" +done +shellcheck -e SC1090 -- "$@" || exit diff --git a/vim/bundle/colon_operator b/vim/bundle/colon_operator -Subproject 8238405d96e500be5c2eedfa638e94e58cc56ac +Subproject 915fe15069acbe3f4021a998344eeda921ea1cd diff --git a/vim/bundle/sahara b/vim/bundle/sahara -Subproject 7504b62005330302110ed26f84ac2f588251ca7 +Subproject b2afabb4e064f68729f69356bf1c5e7fb3e9463 diff --git a/vim/bundle/vertical_region b/vim/bundle/vertical_region -Subproject 1ccf6ca601381d88464c3956f71c83e8d7e3919 +Subproject 8d0f51861cace12c36e3074556f9043c3bd72a0 @@ -193,8 +193,7 @@ set virtualedit+=block set visualbell t_vb= " Tab completion settings -set wildignore=*~,#*# - \,*.7z +set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn \,*.a,*.adf,*.asc,*.au,*.aup,*.avi \,*.bin,*.bmp,*.bz2 \,*.class @@ -214,7 +213,6 @@ set wildignore=*~,#*# \,*.wav,*.webm \,*.xbm,*.xcf,*.xls,*.xlsx,*.xpm,*.xz \,*.zip - \,.DS_Store,.git,.hg,.svn if exists('+wildignorecase') set wildignorecase " Case insensitive, if supported (v7.3.072) endif @@ -252,12 +250,10 @@ endif " Map double Ctrl-K in insert mode to search digraph names imap <C-K><C-K> <Plug>(DigraphSearch) -" Stack normal/visual/select Ctrl-L to clear search highlight +" Stack Ctrl-L to clear search highlight, make it work in insert mode too nnoremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L> vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L> - -" Make Ctrl-L work in insert mode too; good for choppy terminals -inoremap <silent> <C-L> <C-O>:redraw<CR> +inoremap <silent> <C-L> <C-O>:<C-U>nohlsearch<CR><C-O><C-L> " Remap normal/visual & and g& to preserve substitution flags nnoremap <silent> & :&&<CR> @@ -429,12 +425,10 @@ onoremap <Leader>_ :<C-U>normal! `[v`]<CR> onoremap <Leader>% :<C-U>normal! 1GVG<CR> " \{ and \} move to lines with non-space chars before current column -nmap <Leader>{ <Plug>(VerticalRegionUp) -nmap <Leader>} <Plug>(VerticalRegionDown) -omap <Leader>{ <Plug>(VerticalRegionUp) -omap <Leader>} <Plug>(VerticalRegionDown) -xmap <Leader>{ <Plug>(VerticalRegionUp) -xmap <Leader>} <Plug>(VerticalRegionDown) +map <Leader>{ <Plug>(VerticalRegionUp) +sunmap <Leader>{ +map <Leader>} <Plug>(VerticalRegionDown) +sunmap <Leader>} " \/ types :vimgrep for me ready to enter a search pattern nnoremap <Leader>/ :<C-U>vimgrep /\c/j **<S-Left><S-Left><Right> |