diff --git a/arch-nspawn.in b/arch-nspawn.in index a612624b..275cff7f 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -1,14 +1,6 @@ #!/bin/bash -# License: GNU GPLv2 # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/archbuild.in b/archbuild.in index 7cd65bd4..e6cf19a6 100644 --- a/archbuild.in +++ b/archbuild.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/archco.in b/archco.in index 77cc8c4d..a93d8199 100644 --- a/archco.in +++ b/archco.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/archrelease.in b/archrelease.in index 491e68f5..252db282 100644 --- a/archrelease.in +++ b/archrelease.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/valid-tags.sh) diff --git a/bash_completion.in b/bash_completion.in index 9feef74b..e7925b37 100644 --- a/bash_completion.in +++ b/bash_completion.in @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later _devtools_compgen() { local i r diff --git a/checkpkg.in b/checkpkg.in index d7c09486..f40989d2 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later shopt -s extglob diff --git a/commitpkg.in b/commitpkg.in index eb0fc55a..9d1c3aa6 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/crossrepomove.in b/crossrepomove.in index a88b7229..c028d62f 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/find-libdeps.in b/find-libdeps.in index 35094d55..e1423b8a 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/finddeps.in b/finddeps.in index 7237d67b..05b3530e 100644 --- a/finddeps.in +++ b/finddeps.in @@ -2,7 +2,7 @@ # # finddeps - find packages that depend on a given depname # -# License: Unspecified +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/lddd.in b/lddd.in index 908923b0..12f8d678 100644 --- a/lddd.in +++ b/lddd.in @@ -2,7 +2,7 @@ # # lddd - find broken library links on your machine # -# License: Unspecified +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/lib/archroot.sh b/lib/archroot.sh index 8f063cd6..d7917daa 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later : # shellcheck disable=2034 diff --git a/lib/common.sh b/lib/common.sh index 12604d80..0092a458 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -1,7 +1,8 @@ #!/hint/bash +# # This may be included with or without `set -euE` - -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later [[ -z ${_INCLUDE_COMMON_SH:-} ]] || return 0 _INCLUDE_COMMON_SH="$(set +o|grep nounset)" diff --git a/lib/valid-repos.sh b/lib/valid-repos.sh index 252fdcf7..9ac96396 100644 --- a/lib/valid-repos.sh +++ b/lib/valid-repos.sh @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later : # shellcheck disable=2034 diff --git a/lib/valid-tags.sh b/lib/valid-tags.sh index 3cfe0467..d628fd19 100644 --- a/lib/valid-tags.sh +++ b/lib/valid-tags.sh @@ -1,5 +1,6 @@ #!/hint/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later : # shellcheck disable=2034 diff --git a/makechrootpkg.in b/makechrootpkg.in index d7e4ea9b..7944adaf 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -1,14 +1,6 @@ #!/bin/bash -# License: GNU GPLv2 # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/makerepropkg.in b/makerepropkg.in index 1b1987b6..ec9cd360 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -1,21 +1,10 @@ #!/bin/bash -# makerepropkg - rebuild a package to see if it is reproducible # -# Copyright (c) 2019 by Eli Schwartz +# makerepropkg - rebuild a package to see if it is reproducible # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (c) 2019 by Eli Schwartz # +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/mkarchroot.in b/mkarchroot.in index 11d5eb90..3e08af26 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -1,14 +1,6 @@ #!/bin/bash -# License: GNU GPLv2 # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) m4_include(lib/archroot.sh) diff --git a/offload-build.in b/offload-build.in index d40b0048..9e9d71e0 100755 --- a/offload-build.in +++ b/offload-build.in @@ -1,22 +1,10 @@ #!/bin/bash # -# offload-build - build a PKGBUILD on a remote server using makechrootpkg. +# offload-build - build a PKGBUILD on a remote server using makechrootpkg. # -# Copyright (c) 2019 by Eli Schwartz -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (c) 2019 by Eli Schwartz # +# SPDX-License-Identifier: GPL-3.0-or-later source /usr/share/makepkg/util/config.sh diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 704563c8..5091dc28 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -1,5 +1,6 @@ #!/bin/bash -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later # # This script rebuilds a list of packages in order # and reports anything that fails diff --git a/sogrep.in b/sogrep.in index 676d9dfe..dfdd104c 100755 --- a/sogrep.in +++ b/sogrep.in @@ -1,22 +1,10 @@ #!/bin/bash # -# sogrep - find shared library links in an Arch Linux repository. +# sogrep - find shared library links in an Arch Linux repository. # -# Copyright (c) 2019 by Eli Schwartz -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (c) 2019 by Eli Schwartz # +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/common.sh) diff --git a/zsh_completion.in b/zsh_completion.in index 7ff5a69b..7a3516a3 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -1,5 +1,6 @@ #compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg -# License: Unspecified +# +# SPDX-License-Identifier: GPL-3.0-or-later m4_include(lib/valid-tags.sh) m4_include(lib/valid-repos.sh)