Merge remote-tracking branch 'upstream/main' into agnostic

Author: alerque

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[vcsh]
+indent_style = tab
+trim_trailing_whitespace = true

.github/workflows/lint.yml

@@ -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/[email protected]

.github/workflows/test.yml

@@ -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/[email protected]
+        with:
+          install: |
+            Shell::Command
+            Test::Most
+      - name: Run tests
+        run: |
+          make test

.gitignore

@@ -1,3 +1,4 @@
+vcsh.1
 *.patch
 *.swp
 .swp

CONTRIBUTORS

@@ -1,29 +1,41 @@
 Alphabetical list of surnames of everyone who ever committed to this repository.
 Auto-generated from tools/list_CONTRIBUTORS.
 
+Skurikhin Alexander <[email protected]>
 Eric Bouchut <[email protected]>
 Dridi Boukelmoune <[email protected]>
 Rob Cornish <[email protected]>
 Vincent Demeester <[email protected]>
+Mert Dirik <[email protected]>
+Jeff Fein-Worton <[email protected]>
 Thomas Ferris Nicolaisen <[email protected]>
 martin f. krafft <[email protected]>
 Alessandro Ghedini <[email protected]>
+Dennis Gilmore <[email protected]>
+Thorsten Glaser <[email protected]>
+G.raud <[email protected]>
 Mikhail Gusarov <[email protected]>
 Valentin Haenel <[email protected]>
 Richard Hartmann <[email protected]>
 Gregor Jasny <[email protected]>
 Errietta Kostala <[email protected]>
+Yuval Langer <[email protected]>
 Caleb Maclennan <[email protected]>
 Markus Martin <[email protected]>
 mek-apelsin <[email protected]>
 Evan Pitstick <[email protected]>
 Dieter Plaetinck <[email protected]>
 Corey Quinn <[email protected]>
 Pavlos Ratis <[email protected]>
+Dewey Sasser <[email protected]>
 Gernot Schulz <[email protected]>
+Aaron Schumacher <[email protected]>
+Andrew Schwartzmeyer <[email protected]>
 Dato Simó <[email protected]>
 Alexander Skurikhin <[email protected]>
 Jonathan Sternberg <[email protected]>
+Mathias Svensson <[email protected]>
 Frank Terbeck <[email protected]>
+mirabilos <[email protected]>
 Aaron VonderHaar <[email protected]>
 Tony <[email protected]>

Makefile

@@ -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)
 
@@ -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