Minor fixes
This commit is contained in:
parent
48a1c80024
commit
382db0d804
|
@ -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
|
||||
|
|
|
@ -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" &&
|
||||
|
|
Loading…
Reference in New Issue