aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-01 09:42:27 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-01 09:42:27 +1300
commit639377618b820f48c2e7e397a4b0267afaaa450e (patch)
treec1e4d0244b1a2da20f5edb13161227ab88640817
parent6cd6eca312208b503c986024daf45b0f73a0d48c (diff)
parent0c02d983e77d2820b623e2b17e91c24b0917ac6f (diff)
downloaddotfiles-0.3.0.tar.gz
Merge branch 'release/v0.3.0'v0.3.0
* release/v0.3.0: Bump version number to 0.3.0 Add dfv(1df) version-printing tool Correct variable name in comment Remove extraneous spacing between words
-rw-r--r--.gitignore3
-rw-r--r--Makefile4
-rw-r--r--VERSION4
-rw-r--r--bin/dfv.mi58
-rw-r--r--man/man1/dfv.1df12
-rw-r--r--vim/after/syntax/html.vim2
-rw-r--r--vim/after/syntax/sh.vim5
7 files changed, 32 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index deccfe5e..6d07e894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,9 @@ bin/csmw
bin/d2u
bin/dam
bin/ddup
+bin/dfv
+bin/dfv.sh
+bin/dfv.m4
bin/dmp
bin/dub
bin/edda
diff --git a/Makefile b/Makefile
index 5b316294..6440b805 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ BINS = bin/ap \
bin/dam \
bin/d2u \
bin/ddup \
+ bin/dfv \
bin/dmp \
bin/dub \
bin/edda \
@@ -207,6 +208,7 @@ BINS = bin/ap \
bin/xrq
BINS_M4 = bin/chn.m4 \
+ bin/dfv.m4 \
bin/edda.m4 \
bin/oii.m4 \
bin/pst.m4 \
@@ -216,6 +218,7 @@ BINS_M4 = bin/chn.m4 \
bin/urlc.m4
BINS_SH = bin/chn.sh \
+ bin/dfv.sh \
bin/edda.sh \
bin/oii.sh \
bin/pst.sh \
@@ -283,6 +286,7 @@ clean distclean:
m4 < $< > $@
bin/chn.sh: bin/chn.m4 include/mktd.m4
+bin/dfv.sh: bin/dfv.m4 include/mktd.m4
bin/edda.sh: bin/edda.m4 include/mktd.m4
bin/oii.sh: bin/oii.m4 include/mktd.m4
bin/pst.sh: bin/pst.m4 include/mktd.m4
diff --git a/VERSION b/VERSION
index 27d5d004..e14f509a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.2.1
-Tue Oct 31 10:36:33 UTC 2017
+tejr dotfiles v0.3.0
+Tue Oct 31 20:36:26 UTC 2017
diff --git a/bin/dfv.mi5 b/bin/dfv.mi5
new file mode 100644
index 00000000..02f1721d
--- /dev/null
+++ b/bin/dfv.mi5
@@ -0,0 +1,8 @@
+# Print dotfiles version information
+cat <<'EOF'
+<%
+ include(VERSION)
+ syscmd(`printf "Built on %s by %s@%s\n" "$(date)" "$(id -nu)" "$(uname -n)"')
+%>
+The next 1<<10 years are ours!
+EOF
diff --git a/man/man1/dfv.1df b/man/man1/dfv.1df
new file mode 100644
index 00000000..b3274d44
--- /dev/null
+++ b/man/man1/dfv.1df
@@ -0,0 +1,12 @@
+.TH DFV 1df "November 2017" "Manual page for dfv"
+.SH NAME
+.B dfv
+\- print dotfiles distribution version information
+.SH SYNOPSIS
+.B dfv
+.SH DESCRIPTION
+.B dfv
+prints some version information about the dotfiles distribution installed,
+including some details about the date the tool itself was built.
+.SH AUTHOR
+Tom Ryder <tom@sanctum.geek.nz>
diff --git a/vim/after/syntax/html.vim b/vim/after/syntax/html.vim
index 80012114..d476ec2c 100644
--- a/vim/after/syntax/html.vim
+++ b/vim/after/syntax/html.vim
@@ -1,3 +1,3 @@
" Make HTML highlighting a bit less visually noisy
-highlight! link htmlTag Type
+highlight! link htmlTag Type
highlight! link htmlEndTag htmlTag
diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim
index 9da1095d..d07f4cff 100644
--- a/vim/after/syntax/sh.vim
+++ b/vim/after/syntax/sh.vim
@@ -1,8 +1,7 @@
" If g:is_posix is set, g:is_kornshell is probably set too, a strange decision
" by sh.vim. No matter; we can tease out whether this is actually a Korn shell
-" script using our own b:is_kornshell_proper flag set at the end of
-" ~/.vim/ftdetect/sh.vim, and if it isn't, we'll throw away the highlighting
-" groups for ksh.
+" script using our own b:is_ksh flag set at the end of ~/.vim/ftdetect/sh.vim,
+" and if it isn't, we'll throw away the highlighting groups for ksh.
if exists('g:is_kornshell') && !exists('b:is_ksh')
syntax clear kshSpecialVariables
syntax clear kshStatement