From 187bff8e95171624bcb8571adac2a3fc7ec2da39 Mon Sep 17 00:00:00 2001 From: Kuoi Date: Thu, 9 Feb 2023 19:34:41 +0800 Subject: [PATCH] *: clean git pkg and rm py --- BioArchLinux/archrepo2/PKGBUILD | 2 +- BioArchLinux/archrepo2/lilac.py | 9 --------- BioArchLinux/archrepo2/lilac.yaml | 4 ++++ BioArchLinux/bioarchlinux-keyring/PKGBUILD | 3 ++- BioArchLinux/bioarchlinux-mirrorlist/PKGBUILD | 3 ++- BioArchLinux/bioarchlinux-mirrorlist/lilac.py | 10 ---------- BioArchLinux/bioarchlinux-mirrorlist/lilac.yaml | 6 ++++-- BioArchLinux/bioarchlinux-packages/PKGBUILD | 2 +- BioArchLinux/bioarchlinux-packages/lilac.yaml | 7 +++---- BioArchLinux/bioawk/PKGBUILD | 4 ++++ BioArchLinux/bioawk/lilac.py | 10 ---------- BioArchLinux/bioawk/lilac.yaml | 7 +++---- BioArchLinux/cdbfasta/PKGBUILD | 3 +-- BioArchLinux/cdbfasta/lilac.yaml | 3 --- BioArchLinux/devtools-bio/PKGBUILD | 3 +-- BioArchLinux/devtools-bio/lilac.py | 10 ---------- BioArchLinux/devtools-bio/lilac.yaml | 6 ++++-- BioArchLinux/ev-view/lilac.yaml | 11 ++++------- BioArchLinux/evs/lilac.yaml | 11 ++++------- BioArchLinux/fasta/lilac.py | 10 ---------- BioArchLinux/fasta/lilac.yaml | 8 ++++++-- BioArchLinux/fasta_ushuffle/lilac.py | 10 ---------- BioArchLinux/fasta_ushuffle/lilac.yaml | 8 ++++++-- BioArchLinux/garli/lilac.py | 11 ----------- BioArchLinux/garli/lilac.yaml | 8 +++++--- BioArchLinux/lilac/lilac.yaml | 1 - BioArchLinux/mcscanx/PKGBUILD | 2 +- BioArchLinux/mcscanx/lilac.yaml | 1 - .../mediawiki-extensions-mobilefrontend/lilac.py | 10 ---------- .../mediawiki-extensions-mobilefrontend/lilac.yaml | 8 ++++++-- BioArchLinux/mpi-bucky/lilac.yaml | 8 ++++---- BioArchLinux/popart/PKGBUILD | 4 ++++ BioArchLinux/popart/lilac.py | 11 ----------- BioArchLinux/popart/lilac.yaml | 8 +++++--- BioArchLinux/seqlib/lilac.yaml | 7 +++++-- BioArchLinux/smartdenovo/PKGBUILD | 3 +-- BioArchLinux/smartdenovo/lilac.py | 11 ----------- BioArchLinux/smartdenovo/lilac.yaml | 7 +++++-- BioArchLinux/treeviewx/lilac.yaml | 1 - BioArchLinux/vcflib/lilac.py | 10 ---------- BioArchLinux/vcflib/lilac.yaml | 8 ++++++-- 41 files changed, 92 insertions(+), 177 deletions(-) delete mode 100644 BioArchLinux/archrepo2/lilac.py delete mode 100644 BioArchLinux/bioarchlinux-mirrorlist/lilac.py delete mode 100644 BioArchLinux/bioawk/lilac.py delete mode 100644 BioArchLinux/devtools-bio/lilac.py delete mode 100644 BioArchLinux/fasta/lilac.py delete mode 100644 BioArchLinux/fasta_ushuffle/lilac.py delete mode 100644 BioArchLinux/garli/lilac.py delete mode 100644 BioArchLinux/mediawiki-extensions-mobilefrontend/lilac.py delete mode 100644 BioArchLinux/popart/lilac.py delete mode 100644 BioArchLinux/smartdenovo/lilac.py delete mode 100755 BioArchLinux/vcflib/lilac.py diff --git a/BioArchLinux/archrepo2/PKGBUILD b/BioArchLinux/archrepo2/PKGBUILD index fd99dd2e60..6528eb0a0e 100644 --- a/BioArchLinux/archrepo2/PKGBUILD +++ b/BioArchLinux/archrepo2/PKGBUILD @@ -18,7 +18,7 @@ _gitroot=archrepo2 pkgver() { cd "$srcdir/$_gitroot" - git describe | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/v//' + printf $(TZ=UTC git log --no-walk --tags --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) } build() { diff --git a/BioArchLinux/archrepo2/lilac.py b/BioArchLinux/archrepo2/lilac.py deleted file mode 100644 index ba5818af20..0000000000 --- a/BioArchLinux/archrepo2/lilac.py +++ /dev/null @@ -1,9 +0,0 @@ -from lilaclib import * - -def pre_build(): - update_pkgrel() - vcs_update() - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/archrepo2/lilac.yaml b/BioArchLinux/archrepo2/lilac.yaml index 30970fbe1b..cd5414bd5f 100644 --- a/BioArchLinux/archrepo2/lilac.yaml +++ b/BioArchLinux/archrepo2/lilac.yaml @@ -1,6 +1,10 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org +post_build_script: | + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() update_on: - source: github github: lilydjwg/archrepo2 diff --git a/BioArchLinux/bioarchlinux-keyring/PKGBUILD b/BioArchLinux/bioarchlinux-keyring/PKGBUILD index c42d604823..4e70077160 100644 --- a/BioArchLinux/bioarchlinux-keyring/PKGBUILD +++ b/BioArchLinux/bioarchlinux-keyring/PKGBUILD @@ -11,7 +11,8 @@ license=('GPL') source=('git+https://github.com/BioArchLinux/keyring.git') sha256sums=('SKIP') pkgver(){ - date +%Y%m%d + cd "${srcdir}"/keyring + printf $(TZ=UTC git log --no-walk --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) } package() { cd "${srcdir}"/keyring diff --git a/BioArchLinux/bioarchlinux-mirrorlist/PKGBUILD b/BioArchLinux/bioarchlinux-mirrorlist/PKGBUILD index 1a8537c6b6..4006233e25 100644 --- a/BioArchLinux/bioarchlinux-mirrorlist/PKGBUILD +++ b/BioArchLinux/bioarchlinux-mirrorlist/PKGBUILD @@ -11,7 +11,8 @@ backup=(etc/pacman.d/mirrorlist.bio) source=(https://raw.githubusercontent.com/BioArchLinux/mirror/main/mirrorlist.bio) sha256sums=('8a90984620549313c521f12b8b4dea49275af9056959d966973f97a97ce41c63') pkgver(){ - date +%Y%m%d + cd $srcdir/mirror + printf $(TZ=UTC git log --no-walk --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) } package() { mkdir -p "$pkgdir/etc/pacman.d" diff --git a/BioArchLinux/bioarchlinux-mirrorlist/lilac.py b/BioArchLinux/bioarchlinux-mirrorlist/lilac.py deleted file mode 100644 index fcbff72939..0000000000 --- a/BioArchLinux/bioarchlinux-mirrorlist/lilac.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -from lilaclib import * - -def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/bioarchlinux-mirrorlist/lilac.yaml b/BioArchLinux/bioarchlinux-mirrorlist/lilac.yaml index eb42668b14..ca2b7b89ee 100644 --- a/BioArchLinux/bioarchlinux-mirrorlist/lilac.yaml +++ b/BioArchLinux/bioarchlinux-mirrorlist/lilac.yaml @@ -2,8 +2,10 @@ build_prefix: extra-x86_64 maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org -pre_build: vcs_update -post_build: git_pkgbuild_commit +post_build_script: | + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() update_on: - source: github github: BioArchLinux/mirror diff --git a/BioArchLinux/bioarchlinux-packages/PKGBUILD b/BioArchLinux/bioarchlinux-packages/PKGBUILD index 0f41f71dae..8b0e513430 100644 --- a/BioArchLinux/bioarchlinux-packages/PKGBUILD +++ b/BioArchLinux/bioarchlinux-packages/PKGBUILD @@ -16,7 +16,7 @@ sha256sums=('SKIP' 'dd2a46ad3b1e7d532b53f10ced77fbd74924c8635ff3778d62a42f0606295d2c') pkgver() { cd "$pkgname" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf $(TZ=UTC git log --no-walk --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) } build() { cd "$pkgname"/src diff --git a/BioArchLinux/bioarchlinux-packages/lilac.yaml b/BioArchLinux/bioarchlinux-packages/lilac.yaml index 7670445aea..169434a417 100644 --- a/BioArchLinux/bioarchlinux-packages/lilac.yaml +++ b/BioArchLinux/bioarchlinux-packages/lilac.yaml @@ -2,11 +2,10 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org build_prefix: extra-x86_64 -pre_build_script: | - update_pkgrel() - vcs_update() post_build_script: | - git_pkgbuild_commit() + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() update_on: - source: github github: BioArchLinux/bioarchlinux-packages diff --git a/BioArchLinux/bioawk/PKGBUILD b/BioArchLinux/bioawk/PKGBUILD index a7a0f0d06d..00030866ff 100644 --- a/BioArchLinux/bioawk/PKGBUILD +++ b/BioArchLinux/bioawk/PKGBUILD @@ -12,6 +12,10 @@ conflicts=("bioawk") makedepends=('bison' 'make' 'gcc' 'git') source=("git+https://github.com/lh3/bioawk.git") md5sums=('SKIP') +pkgver(){ + cd $srcdir/bioawk + printf $(TZ=UTC git log --no-walk --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) +} prepare() { cd "$srcdir/bioawk" diff --git a/BioArchLinux/bioawk/lilac.py b/BioArchLinux/bioawk/lilac.py deleted file mode 100644 index fcbff72939..0000000000 --- a/BioArchLinux/bioawk/lilac.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -from lilaclib import * - -def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/bioawk/lilac.yaml b/BioArchLinux/bioawk/lilac.yaml index 610012beb0..694f7ad75c 100644 --- a/BioArchLinux/bioawk/lilac.yaml +++ b/BioArchLinux/bioawk/lilac.yaml @@ -2,11 +2,10 @@ build_prefix: extra-x86_64 maintainers: - github: starsareintherose email: starsareintherose@outlook.com -pre_build_script: | - update_pkgrel() - vcs_update() post_build_script: | - git_pkgbuild_commit() + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() update_on: - source: github github: lh3/bioawk diff --git a/BioArchLinux/cdbfasta/PKGBUILD b/BioArchLinux/cdbfasta/PKGBUILD index 90d5c0ab8f..0086b9ec13 100644 --- a/BioArchLinux/cdbfasta/PKGBUILD +++ b/BioArchLinux/cdbfasta/PKGBUILD @@ -14,8 +14,7 @@ md5sums=('SKIP') pkgver() { cd "$srcdir/${pkgname}" - # Git, no tags available - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf $(TZ=UTC git log --no-walk --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) } build() { diff --git a/BioArchLinux/cdbfasta/lilac.yaml b/BioArchLinux/cdbfasta/lilac.yaml index e2d679380e..cc3f2af524 100644 --- a/BioArchLinux/cdbfasta/lilac.yaml +++ b/BioArchLinux/cdbfasta/lilac.yaml @@ -2,9 +2,6 @@ build_prefix: extra-x86_64 maintainers: - github: github.com/kbipinkumar email: bipin@ccmb.res.in -pre_build_script: | - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - vcs_update() post_build_script: | git_add_files('PKGBUILD') git_pkgbuild_commit() diff --git a/BioArchLinux/devtools-bio/PKGBUILD b/BioArchLinux/devtools-bio/PKGBUILD index 6ea9f5cfd0..125ae703e0 100644 --- a/BioArchLinux/devtools-bio/PKGBUILD +++ b/BioArchLinux/devtools-bio/PKGBUILD @@ -14,8 +14,7 @@ sha256sums=('SKIP') pkgver() { cd "$srcdir/devtools-bio" - - echo "$(git rev-list --count master).$(git rev-parse --short master)" + printf $(TZ=UTC git log --no-walk --pretty="%cd" --decorate=full --date=format-local:%Y.%m.%d | head -n 1) } build() { diff --git a/BioArchLinux/devtools-bio/lilac.py b/BioArchLinux/devtools-bio/lilac.py deleted file mode 100644 index fcbff72939..0000000000 --- a/BioArchLinux/devtools-bio/lilac.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -from lilaclib import * - -def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/devtools-bio/lilac.yaml b/BioArchLinux/devtools-bio/lilac.yaml index 992e037191..175628d8c9 100644 --- a/BioArchLinux/devtools-bio/lilac.yaml +++ b/BioArchLinux/devtools-bio/lilac.yaml @@ -2,8 +2,10 @@ build_prefix: extra-x86_64 maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org -pre_build: vcs_update -post_build: git_pkgbuild_commit +post_build_script: | + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() update_on: - source: github github: BioArchLinux/devtools-bio diff --git a/BioArchLinux/ev-view/lilac.yaml b/BioArchLinux/ev-view/lilac.yaml index a12690d060..468ff4a3e6 100644 --- a/BioArchLinux/ev-view/lilac.yaml +++ b/BioArchLinux/ev-view/lilac.yaml @@ -2,14 +2,11 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org build_prefix: extra-x86_64 -pre_build_script: | - update_pkgrel() - vcs_update() - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) post_build_script: | - git_pkgbuild_commit() - update_aur_repo() + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() + update_aur_repo() update_on: - source: github github: js-arias/ev-view diff --git a/BioArchLinux/evs/lilac.yaml b/BioArchLinux/evs/lilac.yaml index f5d9a8c85f..5818c7e38d 100644 --- a/BioArchLinux/evs/lilac.yaml +++ b/BioArchLinux/evs/lilac.yaml @@ -2,14 +2,11 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org build_prefix: extra-x86_64 -pre_build_script: | - update_pkgrel() - vcs_update() - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) post_build_script: | - git_pkgbuild_commit() - update_aur_repo() + git_add_files('PKGBUILD') + git_pkgbuild_commit() + git_commit() + update_aur_repo() update_on: - source: github github: js-arias/evs diff --git a/BioArchLinux/fasta/lilac.py b/BioArchLinux/fasta/lilac.py deleted file mode 100644 index fcbff72939..0000000000 --- a/BioArchLinux/fasta/lilac.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -from lilaclib import * - -def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/fasta/lilac.yaml b/BioArchLinux/fasta/lilac.yaml index a329a17c29..83f82c34fb 100644 --- a/BioArchLinux/fasta/lilac.yaml +++ b/BioArchLinux/fasta/lilac.yaml @@ -2,8 +2,12 @@ build_prefix: multilib maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org -pre_build: vcs_update -post_build: git_pkgbuild_commit +pre_build_script: | + update_pkgver_and_pkgrel(_G.newver.lstrip('v')) + run_cmd(['updpkgsums']) +post_build_script: | + git_add_files('PKGBUILD') + git_commit() update_on: - source: cmd cmd: curl -sS https://raw.githubusercontent.com/wrpearson/fasta36/v36.3.8/README.md | grep 'Changes in' | sed 's/-/ /g' | sed 's/\*\* /_/g' | sed 's/, /_/g' | head -n 1 | awk '{print $4}' diff --git a/BioArchLinux/fasta_ushuffle/lilac.py b/BioArchLinux/fasta_ushuffle/lilac.py deleted file mode 100644 index 8c66f58ed6..0000000000 --- a/BioArchLinux/fasta_ushuffle/lilac.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 - -from lilaclib import * - -def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/fasta_ushuffle/lilac.yaml b/BioArchLinux/fasta_ushuffle/lilac.yaml index 164de739d6..b65507392f 100644 --- a/BioArchLinux/fasta_ushuffle/lilac.yaml +++ b/BioArchLinux/fasta_ushuffle/lilac.yaml @@ -2,8 +2,12 @@ build_prefix: multilib maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org -pre_build: vcs_update -post_build: git_pkgbuild_commit +pre_build_script: | + update_pkgver_and_pkgrel(_G.newver.lstrip('v')) + run_cmd(['updpkgsums']) +post_build_script: | + git_add_files('PKGBUILD') + git_commit() update_on: - source: cmd cmd: curl -sS https://raw.githubusercontent.com/agordon/fasta_ushuffle/master/README | grep 'VERSION' | awk '{print $2}' diff --git a/BioArchLinux/garli/lilac.py b/BioArchLinux/garli/lilac.py deleted file mode 100644 index 8a6e65aeba..0000000000 --- a/BioArchLinux/garli/lilac.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 - -from lilaclib import * - -def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) - run_cmd(['updpkgsums']) - -def post_build(): - git_add_files('PKGBUILD') - git_commit() diff --git a/BioArchLinux/garli/lilac.yaml b/BioArchLinux/garli/lilac.yaml index dd9399e740..f7de78df5d 100644 --- a/BioArchLinux/garli/lilac.yaml +++ b/BioArchLinux/garli/lilac.yaml @@ -3,10 +3,12 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org pre_build_script: | - update_pkgrel() - vcs_update() + update_pkgver_and_pkgrel(_G.newver.lstrip('v')) + run_cmd(['updpkgsums']) post_build_script: | - git_pkgbuild_commit() + git_add_files('PKGBUILD') + git_commit() + update_aur_repo() update_on: - source: cmd cmd: curl -sS https://github.com/zwickl/garli/tree/master/garli/tags | grep 'href="/zwickl/garli/tree/master/garli/tags' | grep '\-release' | sed 's/