Add deps for scripts and install other scripts

2 files changed, 32 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c21582c36dcf..c2879f5f9e78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,16 @@ pkgbase = flatpak-builder-tools-git
 	license = unknown
 	makedepends = git
 	depends = flatpak-builder
-	depends = python3
+	depends = python>=3.6
+	depends = python-toml
+	depends = python-aiohttp
+	depends = python-requirements-parser
+	depends = perl
+	depends = cpanminus
+	depends = perl-json-maybexs
+	depends = perl-lwp-protocol-https
+	depends = perl-capture-tiny
+	depends = ruby
 	provides = flatpak-builder-tools
 	conflicts = flatpak-builder-tools
 	source = flatpak-builder-tools::git+https://github.com/flatpak/flatpak-builder-tools.git
diff --git a/PKGBUILD b/PKGBUILD
index e4c26c0d0ff9..162b644d9079 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,17 @@ pkgdesc="Various helper tools for flatpak-builder"
 arch=(any)
 url=https://github.com/flatpak/flatpak-builder-tools
 license=(unknown)
-depends=(flatpak-builder python3)
+depends=('flatpak-builder'
+         'python>=3.6'
+         'python-toml'
+         'python-aiohttp'
+         'python-requirements-parser'
+         'perl'
+         'cpanminus'
+         'perl-json-maybexs'
+         'perl-lwp-protocol-https'
+         'perl-capture-tiny'
+         'ruby')
 makedepends=(git)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -33,11 +43,21 @@ package() {
 
 	# Find all tools
 	for _toolname in $(find -type d -regex '^\.\/\w*$' | sed 's,\.\/,,'); do
-		# Find scripts for tool
+		# Find python scripts
 		for _scriptname in $(find "$_toolname" -type f -regex '.*\.py$' | sed "s,$_toolname/flatpak-\\(.*\\)\.py,\1,"); do
 			install -Dm755 "$_toolname/flatpak-$_scriptname.py" "$_binprefix-$_scriptname"
 		done
 
+		# Find perl scripts
+		for _scriptname in $(find "$_toolname" -type f -regex '.*\.pl$' | sed "s,$_toolname/flatpak-\\(.*\\)\.pl,\1,"); do
+			install -Dm755 "$_toolname/flatpak-$_scriptname.pl" "$_binprefix-$_scriptname"
+		done
+
+		# Find ruby scripts
+		for _scriptname in $(find "$_toolname" -type f -regex '.*\.rb$' | sed "s,$_toolname/flatpak_\\(.*\\)\.rb,\1,"); do
+			install -Dm755 "$_toolname/flatpak_$_scriptname.rb" "$_binprefix-$_scriptname"
+		done
+
 		# Find all documentation files for tool
 		for _docname in $(find "$_toolname" -type f -regex '.*\.md$'); do
 			install -Dm644 "$_docname" -t "$_docdir/$_toolname"