aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'hotfix/v0.2.1'v0.2.1Tom Ryder2017-10-315-8/+8
|\
| * Use "shell" not "sh" consistentlyTom Ryder2017-10-314-6/+6
| | | | | | | | | | I'm going to pretend this is a crucially important production fix, in order to try out the "hotfix" part of the "Git flow" workflow.
| * Bump version number to 0.2.1Tom Ryder2017-10-311-2/+2
|/
* Merge branch 'release/v0.2.0'v0.2.0Tom Ryder2017-10-3120-55/+138
|\
| * Bump version number to 0.2.0Tom Ryder2017-10-311-2/+2
| |
| * Merge branch 'feature/lint-stable' into developTom Ryder2017-10-3119-53/+136
| |\
| | * Correct some vestigial programs to shell namesTom Ryder2017-10-313-3/+3
| | | | | | | | | | | | Just for consistency.
| | * Add idea and issue regarding checking and lintingTom Ryder2017-10-312-0/+5
| | | | | | | | | | | | Just for future reference, but the work for this branch is done now.
| | * Bring Xinit check/lint scripts up to standardTom Ryder2017-10-312-4/+11
| | | | | | | | | | | | | | | This makes them more consistent with the work already done on the check and lint scripts for the other targets.
| | * Revamp `lint-vim` target for consistencyTom Ryder2017-10-311-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a positive list of things to check rather than just excluding `bundle`; it's a little clearer what it's doing that way, and easier to add paths to check rather than paths to exclude. We also correctly leverage `vint` accepting multiple arguments, like `shellcheck`.
| | * Inline check arguments for URxvt perlsTom Ryder2017-10-311-2/+1
| | | | | | | | | | | | | | | | | | There's no point making a list out of just one globbed item; we'll just inline it. That's also done for some of the other `check` scripts anyway.
| | * Check and lint URxvt Perls correctlyTom Ryder2017-10-313-5/+11
| | | | | | | | | | | | | | | | | | Require that the URxvt Perls are built correctly. There's only one at the moment, so I'll make that the single prerequisite for the `check-urxvt` target.
| | * Add option terminators to some stray `set` callsTom Ryder2017-10-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the option terminator "--" directly after the `set` call ensures that all following arguments will be interpreted as new arguments for the list. This is probably not strictly applicable here, because the paths that will be stacked up don't start with dashes by definition, but it's likely good practice.
| | * Apply revisions to `check-zsh` target as wellTom Ryder2017-10-311-4/+8
| | | | | | | | | | | | I forgot about this one.
| | * Tidy and correct linting for all three shellsTom Ryder2017-10-316-28/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce each one to target only the dotfiles specifically for that shell, as opposed to previously where for example the `check-sh` target was checking shell shims in for `mpd` and `plenv`. I'm still not completely sure that's the right approach, but it's at least less conceptually muddy than what we had before. Notably, the check and lint for Korn shell includes a single POSIX shell script file in its `shrc.d` subdirectory, so that check is executed separately.
| | * Use shell name not command in check/lint messagesTom Ryder2017-10-312-6/+6
| | | | | | | | | | | | This is a little bit clearer and nicer to read, I think.
| | * Apply stable check and lint methods to games shellTom Ryder2017-10-313-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies the same stable approach to testing the actual built games that are shebannged with #!/bin/sh as has been applied to the shell scripts in the `check-bin` and `lint-bin` targets. There are no GNU Bash games in these directories, so the latter block of code from the `bin` analogues to check or lint those is not needed. The same applies here; this is not as complete a checking or linting of the games directory as it could be; ideally we would check the sed(1) and awk(1) scripts too.
| | * Correct copypaste errors in `check-bin`, `lint-bin`Tom Ryder2017-10-311-3/+3
| | | | | | | | | | | | | | | Use consistent variable names, and strip the correct suffix from the Bash scripts on iteration.
| | * Add conditional Bash `check-bin`, `lint-bin`Tom Ryder2017-10-312-0/+24
| | | | | | | | | | | | | | | | | | Both blocks are analogues of the POSIX checks, but are wrapped in a conditional so that bash(1) doesn't become a hard dependency of the default `make install` target.
| | * Show explicit success message for `lint-bin`Tom Ryder2017-10-311-1/+2
| | | | | | | | | | | | | | | We add an `|| exit` short-circuit for the case of `shellcheck` exiting non-zero.
| | * Correct misleading output for `lint-bin`Tom Ryder2017-10-311-1/+1
| | | | | | | | | | | | | | | We haven't checked all of the shell scripts, just the POSIX sh ones, which at present, is all but one of them; han(1df).
| | * Adjust `check-bin`, `lint-bin` for built scriptsTom Ryder2017-10-313-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `$(BINS)` target a prerequisite of `check-bin` so that all of the scripts with a #!/bin/sh shebang are built, and then check them all by iterating through a glob (and hence an order according to LC_COLLATE) and stripping the `.sh` suffix to find the name of the matching shebanged script. Leverage `shellcheck`'s support of multiple check arguments to build an argument list of the binscripts first before passing all of those to a single call, simply for speed. We don't have anything in this target to test the scripts of any other type, such as the `.awk` or `.sed` scripts. `gawk` has a `--lint` mode that might apply.
| | * Revert "Drastically simplify `lint` scripts"Tom Ryder2017-10-318-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I forgot that the `lint` tools here need to check the *built* files, and that that's the reason the `perlcritic` check against the source .pl file was failing. While it's still true that it would be preferable to test the files found in a deterministic order, this branch's attempt to address that issue is pretty much nonsense and can be abandoned. This reverts commit 196155499c04b2c2050302e6575f1bcbbed052f1.
| | * Drastically simplify `lint` scriptsTom Ryder2017-10-318-19/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using find(1) to run the appropriate lint program over a set of files allows us to be terse and deal a little more dynamically with new files placed in the directories, but the downsides are that it's error-prone and that the order of testing is not predictable, and we'd ideally like the testing to be a little more deterministic than that. Case in point: writing the code for this commit unintentionally uncovered a longstanding issue where the URxvt Perl script `select.pl` was actually not being checked at all, due to an unneeded exclamation mark inverting the `-name` test for `*.pl` files. `select.pl` is presently not passing `perlcritic --brutal` on my machine, and likely has not been compliant since as early as commit 5000365 in March this year: >commit 500036564541ff2d65a7b2f6f6f556202d72d6ce >Author: Tom Ryder <tom@sanctum.geek.nz> >Date: Fri Mar 24 11:01:05 2017 > > Lots of Makefile tidying > > ... > * Favour find(1) calls over shell loops > ... This commit also more clearly delineates between the language being "linted" and the target for which it's being linted. The latter is likely more desirable. This needs clarification.
| * Merge branch 'release/v0.1.0' into developTom Ryder2017-10-312-3/+3
| |\
* | \ Merge branch 'release/v0.1.0'v0.1.0Tom Ryder2017-10-312-1/+3
|\ \ \ | | |/ | |/|
| * | Remove -no_ssl2 from osc(1df)Tom Ryder2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern OpenSSL builds, at least on Debian Stretch, don't even include this as an option anymore, because SSLv2 has been so broken for so long. There's not really much point trying to keep it. $ openssl version OpenSSL 1.1.0f 25 May 2017 $ openssl -no_ssl2 Invalid command '-no_ssl2'; type "help" for a list.
| * | Bump version number to v0.1.0Tom Ryder2017-10-311-2/+2
| |/ | | | | | | Preparing for first "release" under experimental git-flow based model.
| * Merge branch 'feature/versioning' into developTom Ryder2017-10-311-0/+2
|/|
| * Add VERSION number with null dataTom Ryder2017-10-311-0/+2
|/ | | | | | | We'll use this as the basis for a primitive versioning system as I move to a "git flow" based model for fun and practice. <http://nvie.com/posts/a-successful-git-branching-model/>
* Reload indent global defaults before each filetypeTom Ryder2017-10-313-0/+9
| | | | | | Just to be comprehensive, reinstate the global defaults for all the indenting options via the indent/_GLOBAL.vim stub each time the filetype is changed.
* Use clunkier, more compatible indent option resetTom Ryder2017-10-311-6/+5
| | | | | | This method of re-setting the numeric indent local options to their global analogues looks a bit gross, but seems to work on much older versions of Vim (6.2 in this testing).
* Remove duplicated 'encoding' Vim configurationTom Ryder2017-10-311-5/+0
| | | | | This setting is already in vim/config/encoding.vim, having been copied there in 505a2c2; it was intended to be moved rather than copied.
* Complete a partially-written commentTom Ryder2017-10-311-1/+1
| | | | This was added in 52671ad, but not finished.
* Show Vim option values after leader-key toggleTom Ryder2017-10-305-13/+12
| | | | | | | | | | | | Using the very weird syntax: :setlocal option! option? We can toggle the option and print its new value in the same line. For the line breaking options, we only show the value of the 'linebreak' option, because otherwise we print three lines of messages, which requires an <Enter> press, even if we put all three `option?` calls on one :setlocal line.
* Toggle Vim 'hlsearch' and 'incsearch' locallyTom Ryder2017-10-301-4/+4
| | | | | | | | That is, \h and \i shouldn't change the value of the search highlighting or incremental search features globally, just per-buffer. I'm not actually completely sure I want this, but it does seem tidier at the moment.
* Note that StripTrailingWhitespace() does whole docTom Ryder2017-10-301-1/+1
| | | | | Just in case somebody tried to use it to strip whitespace only from a selected range. It could maybe be extended to do this somehow.
* Move 'joinspaces' Vim config to join subfileTom Ryder2017-10-302-4/+3
| | | | | It makes much more sense in this file than it did in the whitespace configuration file.
* Reimplement stable normal-mode J join mappingTom Ryder2017-10-301-4/+24
| | | | | | | | | | | | | This is a tidier method of preserving the cursor position after a normal-mode join that doesn't involve wiping away a mark, though I don't use those too often anyway. It still works with a preceding count via the `v:count1` variable, with an accidental feature: this joins the *next* v:count1 lines, as opposed to joining a *total* of v:count1 lines counting the current one. The latter is what Vim does, but the former is what I'd actually expect, thinking of it as a "repeated operation", so I'm going to leave it this way.
* Add some comments to 'formatoptions' switchingTom Ryder2017-10-301-0/+10
| | | | Just for clarity of reading.
* Move execution out of 'formatoptions' conditionalTom Ryder2017-10-301-2/+3
| | | | Just to do one thing at a time.
* Use full `execute` command, not `exec`Tom Ryder2017-10-301-2/+2
| | | | It's probably best not to use abbreviations in scripts.
* Use clearer method for 'formatoptions' flag toggleTom Ryder2017-10-301-2/+5
| | | | | On looking at this again, I was uncomfortable with `eval`ing an operation. This seems a bit less evil.
* Use explicit case-sensitive 'formatoptions' matchTom Ryder2017-10-301-1/+1
| | | | | | | | Per Google's VimScript style recommendations <https://google.github.io/styleguide/vimscriptguide.xml>: > Always use case-explicit operators for strings (=~# and =~?, never > =~).
* Switch on local formatoptions setting, not globalTom Ryder2017-10-301-1/+1
| | | | | The actual option settings performed by the function are local, so the test should be, too.
* Append "usetab" to `switchbuf`, not switched setTom Ryder2017-10-301-4/+2
| | | | Just to avoid duplication a little; seems a little clearer this way.
* Adjust commenting and spacing of Vim wrap configTom Ryder2017-10-301-3/+18
| | | | | Essentially just breaking up the big block comment at the top into little pieces.
* Keep 'breakindent'-available flag in script varTom Ryder2017-10-301-3/+5
| | | | | | Because this is a version-based check and shouldn't change any runtime, we can just calculate it once as a variable local and persistent to this script, and then store it for reference by the toggling function.
* Rearrange two options for clarityTom Ryder2017-10-301-4/+4
| | | | | It makes more sense to discuss how something wraps after configuring whether it wraps at all.
* Toggle 'wrap' and related Vim options locallyTom Ryder2017-10-301-8/+8
| | | | | Don't change the value of these options for all buffers with the \w and \b maps, just the current one.