From 382db0d8043a9c4adebcfb8762ce5f40f7e9173d Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Sat, 12 Nov 2016 14:36:59 +0100
Subject: [PATCH] Minor fixes

---
 packaging/ARCH/mksrcinfo           | 17 +++++++++++++++++
 packaging/ARCH/update-osync-pkg.sh | 10 ++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packaging/ARCH/mksrcinfo b/packaging/ARCH/mksrcinfo
index fd3990b..6a42272 100755
--- a/packaging/ARCH/mksrcinfo
+++ b/packaging/ARCH/mksrcinfo
@@ -27,7 +27,24 @@ funcgrep() {
   { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2"
 }
 
+# extract_global_var function compatible with bash 4.2
 extract_global_var() {
+	# $1: variable name
+	# $2: multivalued
+	# $3: name of output var
+
+	local attr=$1 isarray=$2 outputvar=$3 ref
+
+	if (( isarray )); then
+		array_build ref "$attr"
+		[[ ${ref[@]} ]] && array_build "$outputvar" "$attr"
+	else
+		[[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}"
+	fi
+}
+
+# extract global_var function compatible with bash 4.3+
+old_extract_global_var() {
   # $1: variable name
   # $2: multivalued
   # $3: name of output var
diff --git a/packaging/ARCH/update-osync-pkg.sh b/packaging/ARCH/update-osync-pkg.sh
index 468f90d..959f207 100755
--- a/packaging/ARCH/update-osync-pkg.sh
+++ b/packaging/ARCH/update-osync-pkg.sh
@@ -5,13 +5,15 @@ cd "osync.aur" &&
 srcdir="." &&
 source "PKGBUILD" &&
 
-# Get pkgver from current osync
-pkgver=$(grep PROGRAM_VERSION= ../../../osync.sh)
-pkgver=${pkgver##*=}
-
 url=$(echo -n ${source[0]} | sed 's/git+//g' | sed 's/#.*//g') &&
 branch=$(echo -n ${source[0]} | sed 's/.*#branch=//g') &&
 git clone -b $branch $url &&
+
+# Get pkgver from current osync
+pkgver=$(grep PROGRAM_VERSION= ./osync/osync.sh)
+pkgver=${pkgver##*=}
+echo $pkgver
+
 sed -i "s/pkgver=.*/pkgver=$(pkgver)/g" "PKGBUILD" &&
 ../mksrcinfo &&
 rm -rf "osync" &&