From 37df0765d284892bf81bddf575fdcb14582b4f5f Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Thu, 19 May 2022 23:49:02 +0200 Subject: cleanup: move PKGBUILD.proto to contrib folder --- Makefile | 2 +- PKGBUILD.proto | 48 ------------------------------------------ contrib/makepkg/PKGBUILD.proto | 48 ++++++++++++++++++++++++++++++++++++++++++ src/checkpkg.in | 2 +- src/commitpkg.in | 2 +- src/crossrepomove.in | 2 +- src/diffpkg.in | 2 +- src/finddeps.in | 2 +- src/rebuildpkgs.in | 2 +- 9 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 PKGBUILD.proto create mode 100644 contrib/makepkg/PKGBUILD.proto diff --git a/Makefile b/Makefile index 6500da0..52f10ef 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ dist: upload: scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/ -check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf PKGBUILD.proto +check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto shellcheck $^ .PHONY: all completion man clean install uninstall dist upload check tag diff --git a/PKGBUILD.proto b/PKGBUILD.proto deleted file mode 100644 index e8690e4..0000000 --- a/PKGBUILD.proto +++ /dev/null @@ -1,48 +0,0 @@ -#!/hint/bash -# shellcheck disable=2034 - -# This is an example PKGBUILD file, so that shellcheck can know what -# variables to expect be set after including a PKGBUILD. - -# Maintainer: Your Name -pkgname=NAME -pkgver=VERSION -pkgrel=1 -epoch= -pkgdesc="" -arch=() -url="" -license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -source=("$pkgname-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") -noextract=() -md5sums=() -validpgpkeys=() - -prepare() { - : -} - -build() { - : -} - -check() { - : -} - -package() { - : -} diff --git a/contrib/makepkg/PKGBUILD.proto b/contrib/makepkg/PKGBUILD.proto new file mode 100644 index 0000000..e8690e4 --- /dev/null +++ b/contrib/makepkg/PKGBUILD.proto @@ -0,0 +1,48 @@ +#!/hint/bash +# shellcheck disable=2034 + +# This is an example PKGBUILD file, so that shellcheck can know what +# variables to expect be set after including a PKGBUILD. + +# Maintainer: Your Name +pkgname=NAME +pkgver=VERSION +pkgrel=1 +epoch= +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=() +checkdepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=("$pkgname-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") +noextract=() +md5sums=() +validpgpkeys=() + +prepare() { + : +} + +build() { + : +} + +check() { + : +} + +package() { + : +} diff --git a/src/checkpkg.in b/src/checkpkg.in index 059f752..da4c67b 100644 --- a/src/checkpkg.in +++ b/src/checkpkg.in @@ -82,7 +82,7 @@ if [[ ! -f PKGBUILD ]]; then die 'This must be run in the directory of a built package.' fi -# shellcheck source=PKGBUILD.proto +# shellcheck source=contrib/makepkg/PKGBUILD.proto . ./PKGBUILD if [[ ${arch[0]} == 'any' ]]; then CARCH='any' diff --git a/src/commitpkg.in b/src/commitpkg.in index 31adcd6..235d12b 100644 --- a/src/commitpkg.in +++ b/src/commitpkg.in @@ -28,7 +28,7 @@ if [[ ! -f PKGBUILD ]]; then fi source=() -# shellcheck source=PKGBUILD.proto +# shellcheck source=contrib/makepkg/PKGBUILD.proto . ./PKGBUILD pkgbase=${pkgbase:-$pkgname} diff --git a/src/crossrepomove.in b/src/crossrepomove.in index c028d62..e4caeea 100644 --- a/src/crossrepomove.in +++ b/src/crossrepomove.in @@ -45,7 +45,7 @@ msg "Downloading sources for %s" "${pkgbase}" svn -q checkout -N "${target_svn}" target_checkout mkdir -p "target_checkout/${pkgbase}/repos" svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die -# shellcheck source=PKGBUILD.proto +# shellcheck source=contrib/makepkg/PKGBUILD.proto . "target_checkout/${pkgbase}/trunk/PKGBUILD" msg "Downloading packages for %s" "${pkgbase}" diff --git a/src/diffpkg.in b/src/diffpkg.in index 963f2c6..17df6e5 100644 --- a/src/diffpkg.in +++ b/src/diffpkg.in @@ -196,7 +196,7 @@ if (( $# < 2 )); then die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information." fi - # shellcheck source=PKGBUILD.proto + # shellcheck source=contrib/makepkg/PKGBUILD.proto . ./PKGBUILD if [[ ${arch[0]} == 'any' ]]; then CARCH='any' diff --git a/src/finddeps.in b/src/finddeps.in index 05b3530..da7cb85 100644 --- a/src/finddeps.in +++ b/src/finddeps.in @@ -20,7 +20,7 @@ fi find . -type d -print0 2>/dev/null| while read -r -d '' d; do if [[ -f "$d/PKGBUILD" ]]; then pkgname=() depends=() makedepends=() optdepends=() - # shellcheck source=PKGBUILD.proto + # shellcheck source=contrib/makepkg/PKGBUILD.proto . "$d/PKGBUILD" for dep in "${depends[@]}"; do # lose the version comparator, if any diff --git a/src/rebuildpkgs.in b/src/rebuildpkgs.in index 164bf08..eddc17f 100644 --- a/src/rebuildpkgs.in +++ b/src/rebuildpkgs.in @@ -54,7 +54,7 @@ bump_pkgrel() { pkg_from_pkgbuild() { # we want the sourcing to be done in a subshell so we don't pollute our current namespace export CARCH PKGEXT - # shellcheck source=PKGBUILD.proto + # shellcheck source=contrib/makepkg/PKGBUILD.proto (source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT") } -- cgit v1.2.3-70-g09d2