Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into agnostic
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Apr 2, 2021
2 parents 7d6a314 + 4f070d3 commit e89cbc7
Show file tree
Hide file tree
Showing 26 changed files with 1,388 additions and 942 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true

[vcsh]
indent_style = tab
trim_trailing_whitespace = true
10 changes: 10 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Lint
on: [push, pull_request]
jobs:
editor-config:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Lint code style
uses: editorconfig-checker/action-editorconfig-checker@v1.0.0
20 changes: 20 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Test
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install build dependencies
run: |
sudo apt-get install ruby-ronn
- name: Install perl test dependencies
uses: perl-actions/install-with-cpanm@v1.1
with:
install: |
Shell::Command
Test::Most
- name: Run tests
run: |
make test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcsh.1
*.patch
*.swp
.swp
Expand Down
12 changes: 12 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,29 +1,41 @@
Alphabetical list of surnames of everyone who ever committed to this repository.
Auto-generated from tools/list_CONTRIBUTORS.

Skurikhin Alexander <a@skurih.in>
Eric Bouchut <ebouchut@gmail.com>
Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Rob Cornish <jrmcornish@gmail.com>
Vincent Demeester <vincent@demeester.fr>
Mert Dirik <mertdirik@gmail.com>
Jeff Fein-Worton <jeff@fein-worton.com>
Thomas Ferris Nicolaisen <tfnico@gmail.com>
martin f. krafft <madduck@madduck.net>
Alessandro Ghedini <alessandro@ghedini.me>
Dennis Gilmore <dennis@ausil.us>
Thorsten Glaser <tg@mirbsd.org>
G.raud <graud@gmx.com>
Mikhail Gusarov <dottedmag@dottedmag.net>
Valentin Haenel <valentin.haenel@gmx.de>
Richard Hartmann <richih@debian.org>
Gregor Jasny <gjasny@googlemail.com>
Errietta Kostala <errietta@errietta.me>
Yuval Langer <yuval.langer@gmail.com>
Caleb Maclennan <caleb@alerque.com>
Markus Martin <markus@archwyrm.net>
mek-apelsin <mek@pels.in>
Evan Pitstick <nerdx00@gmail.com>
Dieter Plaetinck <dieter@plaetinck.be>
Corey Quinn <corey@sequestered.net>
Pavlos Ratis <dastergon@gentoo.org>
Dewey Sasser <dewey@sasser.com>
Gernot Schulz <post@gernot-schulz.com>
Aaron Schumacher <ajschumacher@gmail.com>
Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Dato Simó <dato@net.com.org.es>
Alexander Skurikhin <a.skurihin@gmail.com>
Jonathan Sternberg <jonathansternberg@gmail.com>
Mathias Svensson <freaken@freaken.dk>
Frank Terbeck <ft@bewatermyfriend.org>
mirabilos <tg@debian.org>
Aaron VonderHaar <gruen0aermel@gmail.com>
Tony <zearin@gonk.net>
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PREFIX=/usr
PREFIX?=/usr
DOCDIR_PREFIX=$(PREFIX)/share/doc
DOCDIR=$(DOCDIR_PREFIX)/$(self)
ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
RONN ?= ronn

self=vcsh
manpages=$(self).1
all=test
all=manpages

all: $(all)

Expand Down Expand Up @@ -40,11 +40,9 @@ uninstall:
purge: uninstall
rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/bin/
rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/man/man1/
rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DOCDIR_PREFIX)
rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DOCDIR)
rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(ZSHDIR)

test:
@if which git > /dev/null ; then :; else echo "'git' not found, exiting..."; exit 1; fi

moo:
@if [ -x /usr/games/cowsay ]; then /usr/games/cowsay "I hope you're happy now..."; fi
@if which git > /dev/null; then : ; else echo "'git' not found, exiting..." ; exit 1; fi
@if which prove > /dev/null; then prove; else echo "'prove' not found; not running tests"; fi

0 comments on commit e89cbc7

Please sign in to comment.