Fix PKGBUILD

2 files changed, 29 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9a4041983c4..de2511a91a93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gimp-elsamuko-git
 	pkgdesc = Varoius Gimp scripts and plugins made by elsamuko
-	pkgver = r84.d64e603
+	pkgver = r86.91162f8
 	pkgrel = 1
 	url = https://github.com/elsamuko/gimp-elsamuko
 	arch = i686
@@ -10,8 +10,7 @@ pkgbase = gimp-elsamuko-git
 	depends = gimp
 	conflicts = gimp-elsamuko-plugins
 	conflicts = gimp-elsamuko-scripts
-	source = git+https://github.com/elsamuko/gimp-elsamuko
+	source = git+https://github.com/elsamuko/gimp-elsamuko.git
 	md5sums = SKIP
 
 pkgname = gimp-elsamuko-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5212325b495e..a43891ea8fea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,67 @@
-# Maintainer: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
-
 pkgname=gimp-elsamuko-git
-pkgver=r84.d64e603
+pkgver=r86.91162f8
 pkgrel=1
 pkgdesc='Varoius Gimp scripts and plugins made by elsamuko'
 arch=('i686' 'x86_64')
 url='https://github.com/elsamuko/gimp-elsamuko'
 license=('GPL3')
-groups=()
 depends=(gimp)
 makedepends=(git)
-optdepends=()
 conflicts=(gimp-elsamuko-plugins gimp-elsamuko-scripts)
-source=("git+$url")
-_gitname='gimp-elsamuko'
+source=("git+$url.git")
 md5sums=(SKIP)
 
 pkgver(){
-  if [ -d "$srcdir"/$_gitname ]; then
-    cd "$srcdir"/$_gitname
-    ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" )
-  fi
+  cd ${pkgname%-git}
+  set -o pipefail
+  git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 build(){
+  cd ${srcdir}
   msg2 "Building get-curves plugin"
-  cd "$srcdir/$_gitname/plugins/elsamuko-get-curves"
+  pushd ${pkgname%-git}/plugins/elsamuko-get-curves
   gimptool --build elsamuko-get-curves.c
+  popd
 
   msg2 "Building depthmap-cv plugin TODO"
-  cd "$srcdir/$_gitname/plugins/elsamuko-depthmap-cv"
+  pushd ${pkgname%-git}/plugins/elsamuko-depthmap-cv
 #   TODO:  ld: undefined reference to symbol '_ZTIPKc@@CXXABI_1.3'
 #   ld: /usr/lib/libstdc++.so.6: error adding symbols: DSO missing from command line
-#   export CFLAGS="-I/usr/include/opencv4"
-#   gimptool --build elsamuko-depthmap-cv.cpp
+  # export CFLAGS="-I/usr/include/opencv4"
+  # gimptool --build elsamuko-depthmap-cv.cpp
+  popd
 
   msg2 "Building saturation plugin"
-  cd "$srcdir/$_gitname/plugins/elsamuko-saturation"
+  pushd ${pkgname%-git}/plugins/elsamuko-saturation
   gimptool --build elsamuko-saturation.c
+  popd
 }
 package(){
-  cd "$srcdir"/$_gitname
   _base_dir="$pkgdir/usr/share/gimp/2.0"
   _scripts_dir="$_base_dir/scripts"
   _plugins_dir="$_base_dir/plug-ins"
 
+  cd ${srcdir}/${pkgname%-git}
   msg2 "Installing scripts"
   install -dm755 "$_scripts_dir"
-  for script in scripts/*; do 
+  for script in scripts/*; do
     install -Dm755 $script "$_base_dir/$script"
   done
 
   msg2 "Installing plugins"
+
+  cd ${srcdir}
   install -dm755 "$_plugins_dir"
-  cd "$srcdir/$_gitname/plugins/elsamuko-get-curves"
+  pushd ${pkgname%-git}/plugins/elsamuko-get-curves
   install -Dm755 elsamuko-get-curves "$_plugins_dir/"
+  popd
+
+  # pushd ${pkgname%-git}/plugins/elsamuko-depthmap-cv
+  # install -Dm755 elsamuko-depthmap-cv "$_plugins_dir/"
+  # popd
 
-  cd "$srcdir/$_gitname/plugins/elsamuko-saturation"
+  pushd ${pkgname%-git}/plugins/elsamuko-saturation
   install -Dm755 elsamuko-saturation "$_plugins_dir/"
+  popd
 }