From 9bfdc164813a6a481df4dfd633f568e78d0b5df1 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Fri, 11 Oct 2019 22:30:58 +0300
Subject: =?UTF-8?q?Bump=20version:=201.21=20=E2=86=92=201.22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg |  2 +-
 PKGBUILD         | 12 +++++++-----
 kvmd/__init__.py |  2 +-
 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}
diff --git a/PKGBUILD b/PKGBUILD
index 8225aed8..52a924ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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"
diff --git a/setup.py b/setup.py
index eb18fbae..fe604bec 100755
--- a/setup.py
+++ b/setup.py
@@ -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",
-- 
cgit v1.2.3