Merge remote-tracking branch 'origin/merge-requests/61'

* origin/merge-requests/61:
  doc: remove footer
  tree-wide: add SPDX headers and shebang
  tree-wide: remove vim config
  editorconfig: we use 2 spaces for shell script indentation
  github: remove CI

.editorconfig

@@ -4,19 +4,23 @@
 # top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file, utf-8 charset, 4 space
+# Unix-style newlines with a newline ending every file, utf-8 charset, 2 space
 # indentation, remove any whitespace characters preceding newline characters.
 [*]
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
-indent_style = space
-indent_size = 4
 charset = utf-8
+indent_style = space
+indent_size = 2
 # for shfmt
 switch_case_indent = true
 binary_next_line = true
 
+[*.yml]
+indent_style = space
+indent_size = 4
+
 # Tab indentation (no size specified)
 [Makefile]
 indent_style = tab

.github/workflows/differential-shellcheck.yml

@@ -1,29 +0,0 @@
-name: Differential ShellCheck
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    permissions:
-      security-events: write
-
-    steps:
-      - name: Repository checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Differential ShellCheck
-        uses: redhat-plumbers-in-action/differential-shellcheck@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -34,7 +34,7 @@ genfstab: genfstab.in fstab-helpers
 pacstrap: pacstrap.in common
 	$(edit)
 
-doc/%: doc/%.asciidoc doc/asciidoc.conf doc/footer.asciidoc
+doc/%: doc/%.asciidoc doc/asciidoc.conf
 	$(V_GEN) a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc $<
 
 clean:

arch-chroot.in

@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0-only
 
 shopt -s extglob
 

common

@@ -1,4 +1,7 @@
+#!/hint/bash
+# SPDX-License-Identifier: GPL-2.0-only
 # shellcheck disable=SC2059 # $1 and $2 can contain the printf modifiers
+
 out() { printf "$1 $2\n" "${@:3}"; }
 error() { out "==> ERROR:" "$@"; } >&2
 warning() { out "==> WARNING:" "$@"; } >&2

doc/arch-chroot.8.asciidoc

@@ -51,5 +51,3 @@ See Also
 --------
 
 linkman:pacman[8]
-
-include::footer.asciidoc[]

doc/footer.asciidoc

@@ -1,18 +0,0 @@
-
-Bugs
-----
-Bugs can be reported on the bug tracker 'https://bugs.archlinux.org' in the Arch
-Linux category and title prefixed with [arch-install-scripts] or via
-mailto:arch-projects@archlinux.org[].
-
-
-Authors
--------
-
-Maintainers:
-
-* Dave Reisner <dreisner@archlinux.org>
-* Eli Schwartz <eschwartz@archlinux.org>
-
-For additional contributors, use `git shortlog -s` on the arch-install-scripts.git
-repository.

doc/genfstab.8.asciidoc

@@ -46,5 +46,3 @@ See Also
 --------
 
 linkman:pacman[8]
-
-include::footer.asciidoc[]

doc/pacstrap.8.asciidoc

@@ -62,5 +62,3 @@ See Also
 --------
 
 linkman:pacman[8]
-
-include::footer.asciidoc[]

fstab-helpers

@@ -1,3 +1,6 @@
+#!/hint/bash
+# SPDX-License-Identifier: GPL-2.0-only
+
 # generated from util-linux source: libmount/src/utils.c
 declare -A pseudofs_types=([anon_inodefs]=1
                            [apparmorfs]=1

genfstab.in

@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0-only
 
 shopt -s extglob
 
@@ -243,5 +244,3 @@ done < <(findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root")
     printf '\t%-10s\t%-10s\t%-10s\t0 0\n\n' 'none' 'swap' "$options"
   done
 } </proc/swaps
-
-# vim: et ts=2 sw=2 ft=sh:

pacstrap.in

@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0-only
 
 #
 # Assumptions:
@@ -155,5 +156,3 @@ else
   setup=chroot_setup
   pacstrap
 fi
-
-# vim: et ts=2 sw=2 ft=sh: