Minor improvement

2 files changed, 41 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd0939f18b50..9de4436080ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 # Generated by makepkg 5.1.1
-# Sat Aug 11 13:45:16 UTC 2018
+# Thu Sep 20 10:31:58 UTC 2018
 pkgbase = openorienteering-mapper-git
 	pkgdesc = Map drawing program from OpenOrienteering
-	pkgver = 0.8.2.r4632.fc41d29b
+	pkgver = 0.9.git.566fa81pre.r4649.1d69324f
 	pkgrel = 1
 	url = http://www.openorienteering.org/apps/mapper/
 	install = openorienteering-mapper.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = python
 	makedepends = cmake>=3.2
 	makedepends = qt5-tools>=5.6
 	makedepends = doxygen
 	makedepends = libcups
+	makedepends = python
 	depends = qt5-base>=5.6
 	depends = polyclipping>=6.1.3a
 	depends = proj>=4.9.2
 	depends = gdal
 	optdepends = qt5-imageformats: Support for TIFF etc.
-	provides = openorienteering-mapper=0.8.2.r4632.fc41d29b
+	provides = openorienteering-mapper=0.9.git.566fa81pre.r4649.1d69324f
 	conflicts = openorienteering-mapper
 	source = https://github.com/OpenOrienteering/mapper/archive/master.tar.gz
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 70b58cfadcb0..e59f6512f322 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,56 +2,68 @@
 _orgname=OpenOrienteering
 _pkgname=mapper
 _branch=master
+_use_gh_api=true
+wl_project=${_orgname}
+wl_dl="https://hosted.weblate.org/download/${wl_project}"
 pkgname=${_orgname,,}-${_pkgname}-git
-pkgver=0.8.2.r4632.fc41d29b
+pkgver=0.9.git.566fa81pre.r4649.1d69324f
 pkgrel=1
 pkgdesc="Map drawing program from OpenOrienteering"
 arch=('i686' 'x86_64')
 url="http://www.openorienteering.org/apps/mapper/"
 license=('GPL3')
 depends=('qt5-base>=5.6' 'polyclipping>=6.1.3a' 'proj>=4.9.2' 'gdal')
-#makedepends=('git' 'cmake>=3.2' 'qt5-tools>=5.6' 'doxygen' 'libcups')
-makedepends=('python' 'cmake>=3.2' 'qt5-tools>=5.6' 'doxygen' 'libcups')
+makedepends=('cmake>=3.2' 'qt5-tools>=5.6' 'doxygen' 'libcups')
+if [ "${_use_gh_api}" = true ]; then
+  makedepends+=('python')
+else
+  makedepends+=('git')
+fi
 optdepends=('qt5-imageformats: Support for TIFF etc.')
 provides=("${pkgname//-git}=${pkgver}")
 conflicts=(${pkgname//-git})
 install=${pkgname//-git}.install
-#source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
-source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
+if [ "${_use_gh_api}" = true ]; then
+  source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
+else
+  source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
+fi
 sha256sums=('SKIP')
 
-#pkgver() {
-#  cd ${_pkgname}-${_branch}
-#
-#  RELEASE="$(git describe --tags $(git rev-list --tags --max-count=1) | tr '-' '.')"
-#  REVISION="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-#  printf "%s.r%s" "${RELEASE#?}" "${REVISION}"
-#}
-
 pkgver() {
-  api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
-  base="8a8986ec"
-  head=$(curl -s "$api_url/git/refs/heads/${_branch}" | \
-    python -c "import sys, json; print(json.load(sys.stdin)['object']['sha'][:8])")
-  count=$(curl -s "$api_url/compare/${base}...${head}" | \
-    python -c "import sys, json; print(json.load(sys.stdin)['total_commits'] + 1)")
-  release=$(curl -s "$api_url/releases" | \
-    python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['tag_name'] + ('pre' if r['prerelease'] else ''))")
+  cd ${_pkgname}-${_branch}
+
+  if [ "${_use_gh_api}" = true ]; then
+    api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
+    base="8a8986ec"
+    head=$(curl -s "$api_url/git/refs/heads/${_branch}" | \
+      python -c "import sys, json; print(json.load(sys.stdin)['object']['sha'][:8])")
+    count=$(curl -s "$api_url/compare/${base}...${head}" | \
+      python -c "import sys, json; print(json.load(sys.stdin)['total_commits'] + 1)")
+    release=$(curl -s "$api_url/releases" | \
+      python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['tag_name'] + ('pre' if r['prerelease'] else ''))")
+  else
+    release="$(git describe --tags $(git rev-list --tags --max-count=1))"
+    count="$(git rev-list --count HEAD)"
+    head="$(git rev-parse --short HEAD)"
+  fi
+
+  release=${release//-/.} # pkgver is not allowed to contain hyphens
   printf "%s.r%s.%s" "${release#?}" "${count}" "${head}"
 }
 
 prepare() {
   cd ${_pkgname}-${_branch}/translations
-  weblate_url="https://hosted.weblate.org/download/${_orgname}"
+
   for lang in `ls OpenOrienteering_*.ts | sed 's/OpenOrienteering_\(.*\)\.ts/\1/;/template/d;s/zh_CN/zh_Hans/'`; do
-    curl -so OpenOrienteering_$lang.ts $weblate_url/${_pkgname}/$lang/
+    curl -so OpenOrienteering_$lang.ts $wl_dl/${_pkgname}/$lang/
   done
   rename Hans.ts CN.ts OpenOrienteering_zh_Hans.ts
   for lang in `ls map_symbols_*.ts | sed 's/map_symbols_\(.*\)\.ts/\1/;/template/d'`; do
-    curl -so map_symbols_$lang.ts $weblate_url/map-symbols/$lang/
+    curl -so map_symbols_$lang.ts $wl_dl/map-symbols/$lang/
   done
   for lang in `ls qt_*.ts | sed 's/qt_\(.*\)\.ts/\1/;/template/d'`; do
-    curl -so qt_$lang.ts $weblate_url/qt/$lang/
+    curl -so qt_$lang.ts $wl_dl/qt/$lang/
   done
 }