Install scripts without custom prefix

2 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ad256ab9ade..f3e0abcdfea6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = flatpak-builder-tools-git
 	pkgdesc = Various helper tools for flatpak-builder
-	pkgver = r269.38be01a
-	pkgrel = 1
+	pkgver = r275.1cc5c30
+	pkgrel = 2
 	url = https://github.com/flatpak/flatpak-builder-tools
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 49478b341982..3b589e876aaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Dušan Simić <dusan.simic1810@gmail.com>
 
 pkgname=flatpak-builder-tools-git
-pkgver=r269.38be01a
-pkgrel=1
+pkgver=r275.1cc5c30
+pkgrel=2
 pkgdesc="Various helper tools for flatpak-builder"
 arch=(any)
 url=https://github.com/flatpak/flatpak-builder-tools
@@ -33,21 +33,21 @@ package() {
 	cd "$srcdir/${pkgname%-git}"
 
 	# Prefix for tool script
-	_binprefix="$pkgdir/usr/bin/${pkgname%-git}"
+	_bindir="$pkgdir/usr/bin"
 	# Prefix for docs dir
 	_docdir="$pkgdir/usr/share/doc/${pkgname%-git}"
 
 	# Install json2yaml
-	install -Dm755 "flatpak-json2yaml.py" "$_binprefix-json2yaml"
+	install -Dm755 "flatpak-json2yaml.py" "$_bindir/flatpak-json2yaml"
 	install -Dm644 "readme.md" -t "$_docdir"
 
 	# Find all tools
 	for _toolname in $(find -type d -regex '^\.\/\w*$' | sed 's,\.\/,,'); do
 		# Find and install scripts
-		for _scriptname in $(find "$_toolname" -type f -regex "^$_toolname/flatpak.*" | sed "s,$_toolname/flatpak\\(.*\\),\1,"); do
+		for _scriptname in $(find "$_toolname" -type f -regex "^$_toolname/flatpak.*" | sed "s,$_toolname/\\(.*\\),\1,"); do
 			# Crop extension from scriptname
 			_destname=$(echo "$_scriptname" | sed 's,\(\.py\|\.pl\|\.rb\),,')
-			install -Dm755 "$_toolname/flatpak$_scriptname" "$_binprefix$_destname"
+			install -Dm755 "$_toolname/$_scriptname" "$_bindir/$_destname"
 		done
 
 		# Find all documentation files and install them