diff options
| author | Devaev Maxim <[email protected]> | 2019-10-11 22:30:58 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2019-10-11 22:49:32 +0300 |
| commit | 9bfdc164813a6a481df4dfd633f568e78d0b5df1 (patch) | |
| tree | 70793c45e855926330e59dd1dca672534bd8b879 | |
| parent | 259dc208b2b612e5cb88e8e005083037eedfa4a7 (diff) | |
Bump version: 1.21 → 1.22v1.22
| -rw-r--r-- | .bumpversion.cfg | 2 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | kvmd/__init__.py | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f6766c51..fa39b0d1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = True tag = True -current_version = 1.21 +current_version = 1.22 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)? serialize = {major}.{minor} @@ -17,7 +17,7 @@ for _variant in "${_variants[@]}"; do pkgname+=(kvmd-platform-$_platform-$_board) done pkgbase=kvmd -pkgver=1.21 +pkgver=1.22 pkgrel=1 pkgdesc="The main Pi-KVM daemon" url="https://github.com/pikvm/kvmd" @@ -94,7 +94,7 @@ package_kvmd() { mkdir -p "$pkgdir/etc/kvmd/nginx/ssl" chmod 750 "$pkgdir/etc/kvmd/nginx/ssl" - cp "$_cfg_default/kvmd/nginx"/*.conf "$pkgdir/etc/kvmd/nginx" + cp "$_cfg_default/nginx"/*.conf "$pkgdir/etc/kvmd/nginx" cp "$_cfg_default/kvmd"/*.yaml "$pkgdir/etc/kvmd" chmod 644 "$pkgdir/etc/kvmd"/*.yaml @@ -119,15 +119,17 @@ for _variant in "${_variants[@]}"; do etc/kvmd/main.yaml ) - cd \"\$srcdir/\$pkgname-build\" + cd \"kvmd-\$pkgver\" mkdir -p \"\$pkgdir/etc\"/{kvmd,sysctl.d,udev/rules.d,modules-load.d} cp configs/os/sysctl.conf \"\$pkgdir/etc/sysctl.d/99-kvmd.conf\" cp configs/os/udev/$_platform-$_board.rules \"\$pkgdir/etc/udev/rules.d/99-kvmd.rules\" - cp configs/os/modules-load/$_platform.conf \"\$pkgdir/etc/modules-load.d/kvmd.conf\" + if [ -f configs/os/modules-load/$_platform.conf ]; then + cp configs/os/modules-load/$_platform.conf \"\$pkgdir/etc/modules-load.d/kvmd.conf\" + fi - cp configs/kvmd/main/$_platform.yaml\" \"\$pkgdir/etc/kvmd/main.yaml\" + cp configs/kvmd/main/$_platform.yaml \"\$pkgdir/etc/kvmd/main.yaml\" chmod 444 \"\$pkgdir/etc/kvmd/main.yaml\" if [[ $_platform =~ ^.*-hdmi$ ]]; then diff --git a/kvmd/__init__.py b/kvmd/__init__.py index 0033dda7..b313366d 100644 --- a/kvmd/__init__.py +++ b/kvmd/__init__.py @@ -20,4 +20,4 @@ # ========================================================================== # -__version__ = "1.21" +__version__ = "1.22" @@ -67,7 +67,7 @@ def main() -> None: setup( name="kvmd", - version="1.21", + version="1.22", url="https://github.com/pikvm/kvmd", license="GPLv3", author="Maxim Devaev", |