aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-06-08 09:25:47 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-06-08 09:25:47 +1200
commit97f7b5825d2510ed802fe77a7f74aad9c83f5b3f (patch)
tree84aef67a20ca62ce1b801d7adc21af92f1fc32a9
parentMerge branch 'release/v9.18.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-97f7b5825d2510ed802fe77a7f74aad9c83f5b3f.tar.gz
dotfiles-97f7b5825d2510ed802fe77a7f74aad9c83f5b3f.zip
Merge branch 'release/v9.19.0'v9.19.0
* release/v9.19.0: Write out remaining `find` calls in Makefile Drastically simplify Vim installation target Invoke Vim in a cleaner way for :helptags build Add an issue with build process Remove unneeded comma in msc(1df) Add removing han.bash->han to clean target Remove executable bit from some source code Update cursorline_current.vim to v3.0.2
-rw-r--r--Makefile135
-rw-r--r--VERSION4
-rwxr-xr-xbin/msc.sh2
-rw-r--r--[-rwxr-xr-x]bin/phpcsff.mi50
-rw-r--r--[-rwxr-xr-x]bin/qat.sh0
-rw-r--r--install/helptags.vim2
m---------vim/bundle/cursorline_current0
7 files changed, 34 insertions, 109 deletions
diff --git a/Makefile b/Makefile
index 53b69fbd..6142b909 100644
--- a/Makefile
+++ b/Makefile
@@ -46,21 +46,7 @@
install-tmux \
install-urxvt \
install-vim \
- install-vim-after \
- install-vim-after-ftplugin \
- install-vim-after-indent \
- install-vim-after-plugin \
- install-vim-after-syntax \
- install-vim-bundle \
- install-vim-compiler \
- install-vim-config \
- install-vim-filetype \
- install-vim-ftplugin \
install-vim-gui \
- install-vim-gui-config \
- install-vim-indent \
- install-vim-plugin \
- install-vim-syntax \
install-vint \
install-wget \
install-x \
@@ -295,6 +281,7 @@ clean distclean:
$(BINS_SH) \
$(GAMES) \
$(GIT_TEMPLATE_HOOKS) \
+ bin/han \
dillo/dillorc \
dillo/dillorc.m4 \
git/config \
@@ -401,8 +388,7 @@ install-bash-completion: install-bash
install-bin: $(BINS) install-bin-man
mkdir -p -- $(HOME)/.local/bin
- find bin -type f -perm -u=x \
- -exec cp -p -- {} $(HOME)/.local/bin \;
+ cp -p -- $(BINS) $(HOME)/.local/bin
install-bin-man:
mkdir -p -- $(XDG_DATA_HOME)/man/man1 $(XDG_DATA_HOME)/man/man8
@@ -436,8 +422,7 @@ install-finger:
install-games: $(GAMES) install-games-man
mkdir -p -- $(HOME)/.local/games
- find games -type f -perm -u=x \
- -exec cp -p -- {} $(HOME)/.local/games \;
+ cp -p -- $(GAMES) $(HOME)/.local/games
install-games-man:
mkdir -p -- $(XDG_DATA_HOME)/man/man6
@@ -446,13 +431,12 @@ install-games-man:
install-git: git/config $(GIT_TEMPLATE_HOOKS)
mkdir -p -- $(XDG_CONFIG_HOME)/git
cp -p -- git/config $(XDG_CONFIG_HOME)/git/config
- find git/template \
- -type d -exec sh -c 'mkdir -p -- \
- $(XDG_CONFIG_HOME)/git/template"$${1#git/template}"' \
- _ {} \; \
- -o ! -name '*.*' -exec sh -c 'cp -p -- "$$1" \
- $(XDG_CONFIG_HOME)/git/template"$${1#git/template}"' \
- _ {} \;
+ mkdir -- $(XDG_CONFIG_HOME)/git/template
+ cp -pR -- git/template/description \
+ $(XDG_CONFIG_HOME)/git/template/description
+ mkdir -- $(XDG_CONFIG_HOME)/git/template/hooks
+ cp -pR -- $(GIT_TEMPLATE_HOOKS) \
+ $(XDG_CONFIG_HOME)/git/template/hooks
install-gnupg: gnupg/profile.d/gnupg.sh install-sh
cp -p -- gnupg/profile.d/* $(HOME)/.profile.d
@@ -597,97 +581,36 @@ install-tmux: tmux/tmux.conf install-terminfo
install-urxvt: urxvt/ext/select
mkdir -p -- $(HOME)/.urxvt/ext
- find urxvt/ext -type f ! -name '*.pl' \
- -exec cp -p -- {} $(HOME)/.urxvt/ext \;
+ cp -- urxvt/ext/select $(HOME)/.urxvt/ext
VIM = vim
VIMDIR = $(HOME)/.vim
VIMRC = $(VIMDIR)/vimrc
-install-vim: install-vim-after \
- install-vim-autoload \
- install-vim-bundle \
- install-vim-compiler \
- install-vim-config \
- install-vim-filetype \
- install-vim-ftplugin \
- install-vim-indent \
- install-vim-plugin \
- install-vim-syntax
-
-install-vim-after: install-vim-after-ftplugin \
- install-vim-after-indent \
- install-vim-after-plugin \
- install-vim-after-syntax
-
-install-vim-after-ftplugin: install-vim-compiler
- mkdir -p -- $(VIMDIR)/after/ftplugin
- cp -p -- vim/after/ftplugin/*.vim $(VIMDIR)/after/ftplugin
-
-install-vim-after-indent: install-vim-autoload
- mkdir -p -- $(VIMDIR)/after/indent
- cp -p -- vim/after/indent/*.vim $(VIMDIR)/after/indent
-
-install-vim-after-plugin: install-vim-autoload
- mkdir -p -- $(VIMDIR)/after/plugin
- cp -p -- vim/after/plugin/*.vim $(VIMDIR)/after/plugin
-
-install-vim-after-syntax:
- mkdir -p -- $(VIMDIR)/after/syntax
- cp -p -- vim/after/syntax/*.vim $(VIMDIR)/after/syntax
-
-install-vim-autoload:
- mkdir -p -- $(VIMDIR)/autoload
- cd vim && find autoload \
- -type d -exec sh -c \
- 'mkdir -p -- $(VIMDIR)/"$$1"' _ {} \; \
- -o \
- -type f -exec sh -c \
- 'cp -p -- "$$1" $(VIMDIR)/"$$1"' _ {} \;
-
-install-vim-bundle: install-vim-config
- cd vim/bundle && find */* \
- -type d -exec sh -c \
- 'mkdir -p -- $(VIMDIR)/"$${1#*/}"' _ {} \;
- cd vim/bundle && find */*/* \
- -type f -exec sh -c \
- 'cp -p -- "$$1" $(VIMDIR)/"$${1#*/}"' _ {} \;
- $(VIM) -e -u NONE -c 'helptags $(VIMDIR)/doc' -c quit
-
-install-vim-compiler:
- mkdir -p -- $(VIMDIR)/compiler
- cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
-
-install-vim-config: install-vim-autoload
+install-vim:
+ mkdir -p -- $(VIMDIR)
cp -p -- vim/vimrc.stub $(HOME)/.vimrc
cp -p -- vim/vimrc $(VIMRC)
-
-install-vim-filetype:
- cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
-
-install-vim-ftplugin: install-vim-autoload
- mkdir -p -- $(VIMDIR)/ftplugin
- cp -p -- vim/ftplugin/*.vim $(VIMDIR)/ftplugin
+ cp -p -- vim/filetype.vim \
+ vim/scripts.vim \
+ $(VIMDIR)
+ cp -pR -- vim/after \
+ vim/autoload \
+ vim/compiler \
+ vim/ftplugin \
+ vim/indent \
+ vim/plugin \
+ vim/syntax \
+ $(VIMDIR)
+ for ent in vim/bundle/*/* ; do \
+ [ -d "$$ent" ] || continue ; \
+ cp -pR -- "$$ent" $(VIMDIR) ; \
+ done
GVIMRC = $(HOME)/.gvimrc
-install-vim-gui: install-vim \
- install-vim-gui-config
-
-install-vim-gui-config:
- cp -p -- vim/gvimrc $(GVIMRC)
-
-install-vim-indent:
- mkdir -p -- $(VIMDIR)/indent
- cp -p -- vim/indent/*.vim $(VIMDIR)/indent
-
-install-vim-plugin: install-vim-autoload
- mkdir -p -- $(VIMDIR)/plugin
- cp -p -- vim/plugin/*.vim $(VIMDIR)/plugin
-
-install-vim-syntax:
- mkdir -p -- $(VIMDIR)/syntax
- cp -p -- vim/syntax/*.vim $(VIMDIR)/syntax
+install-vim-gui: install-vim
+ cp -- vim/gvimrc $(GVIMRC)
install-vint:
cp -p -- vint/vintrc.yaml $(HOME)/.vintrc.yaml
diff --git a/VERSION b/VERSION
index cc1a0871..b9302e7f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.18.0
-Thu, 04 Jun 2020 12:07:52 +0000
+tejr dotfiles v9.19.0
+Sun, 07 Jun 2020 21:25:44 +0000
diff --git a/bin/msc.sh b/bin/msc.sh
index feb39b14..051f104a 100755
--- a/bin/msc.sh
+++ b/bin/msc.sh
@@ -3,7 +3,7 @@ username=$(id -nu)
if [ "$#" -eq 0 ] ; then
set -- "$MAIL" /var/mail/"$username" /var/spool/mail/"$username"
fi
-for path ; do
+for path do
[ -e "$path" ] || continue
grep -ch -- '^From ' "$path"
exit
diff --git a/bin/phpcsff.mi5 b/bin/phpcsff.mi5
index 49f00759..49f00759 100755..100644
--- a/bin/phpcsff.mi5
+++ b/bin/phpcsff.mi5
diff --git a/bin/qat.sh b/bin/qat.sh
index 31f5e8dd..31f5e8dd 100755..100644
--- a/bin/qat.sh
+++ b/bin/qat.sh
diff --git a/install/helptags.vim b/install/helptags.vim
new file mode 100644
index 00000000..865f32db
--- /dev/null
+++ b/install/helptags.vim
@@ -0,0 +1,2 @@
+helptags $HOME/.vim/doc
+quit
diff --git a/vim/bundle/cursorline_current b/vim/bundle/cursorline_current
-Subproject 4ab61f5dfa9a2868c529c75a50219dac6619080
+Subproject d1b8db2fe6b06bd556c777c7bd9d4632f12a3a1