summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDušan Simić2021-08-18 19:50:26 +0200
committerDušan Simić2021-08-18 19:50:26 +0200
commit7b9cf34e6f3c18bce66164adfd12b0a6533b4abf (patch)
tree32731a11af7c65c75508a0d8983e6c9e974c1a9b
parentb8af88a6825e70e5b57f0ed643b194430024edf8 (diff)
downloadaur-7b9cf34e6f3c18bce66164adfd12b0a6533b4abf.tar.gz
Fix license and refactor script installation
License actually exists for some scripts and it's MIT, for some there is no clear license. Script installation is refactored so there is now only one loop
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD22
2 files changed, 8 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c2879f5f9e78..2ad256ab9ade 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,6 +4,7 @@ pkgbase = flatpak-builder-tools-git
pkgrel = 1
url = https://github.com/flatpak/flatpak-builder-tools
arch = any
+ license = MIT
license = unknown
makedepends = git
depends = flatpak-builder
diff --git a/PKGBUILD b/PKGBUILD
index 162b644d9079..49478b341982 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Various helper tools for flatpak-builder"
arch=(any)
url=https://github.com/flatpak/flatpak-builder-tools
-license=(unknown)
+license=(MIT unknown)
depends=('flatpak-builder'
'python>=3.6'
'python-toml'
@@ -43,22 +43,14 @@ package() {
# Find all tools
for _toolname in $(find -type d -regex '^\.\/\w*$' | sed 's,\.\/,,'); do
- # 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"
+ # Find and install scripts
+ for _scriptname in $(find "$_toolname" -type f -regex "^$_toolname/flatpak.*" | sed "s,$_toolname/flatpak\\(.*\\),\1,"); do
+ # Crop extension from scriptname
+ _destname=$(echo "$_scriptname" | sed 's,\(\.py\|\.pl\|\.rb\),,')
+ install -Dm755 "$_toolname/flatpak$_scriptname" "$_binprefix$_destname"
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
+ # Find all documentation files and install them
for _docname in $(find "$_toolname" -type f -regex '.*\.md$'); do
install -Dm644 "$_docname" -t "$_docdir/$_toolname"
done