Tag for commit 3640af684f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVwDzeAAoJEBu5sftaTG2tL2oQAJd/9roUz5IMyr7maGNgVwUC
sNrExi5SNr5J2aYjuVmXCj6pYQiFnDeFHkcdtO4x8DPjEil7m63wVFX7AG+W/2yv
KtI0+lBW+uy0cUudbrYCdVGCfMg5/1W9Vh6ZiDCh5Rw+bNeD7QyPpwgRvPMrj65d
2o+1XB+XLIGfMS0F+IO/kviI9cqFxgOpcdEQML9PD68mr5UBnDg7TGAQQPrmW9Cr
aJmX6Sw4IGdVJpNpmB8XFm/xoEu+2nCnu+Kfm8KXdEfmhpZWt3U4FAKn0ooZrOMW
J88i0UPYk8wy3nxq26inAfw48NCSe2+ROhkUKaZXdr396IK8/OypeimFomRk63Ef
3R29JyBZ4SMNYq6f8IoW3FmzyA9kuTR+9C85bV2TKk5NYoxZEJgJIy0+frjwAgu5
Im/79gRveYtEIgIcI1RxqLuRtDD2XTqBafds6dHihkeDSZZLYWXiXehoTABqnQso
Ppm+p2AVoqlVnd8UbJi2zpv72xJSZ+dNv9j1s54aYWbOF6U7w0qF6+XJZTu1dV7W
rewxl3hL5B1knKVIJw/mQuWYr/2quVtghmmE77emdSB3N25Dh/99RdIyp8GG4SRp
EE+e6KyXWmMWx0AwaBIT0KxUHJ0R/2+KatXtxdNkkpNnhHDZM7+U493+qykBYiVH
Xu/I+dBd+i6s20FAvtWt
=eY3W
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJVwUfgAAoJEAY5OLpCz6ck3wMP/04y4jgAQ4LycKRHwytXEPYV
Q+cusyYHjQP0toCqZyKS1DewdHQecyOziEv/eFjDylZLCknfrZasgCpc9CuzZbHB
GOtFFVC+yg4jvcbHa1ArQ8VQ90qvoNfFYImdqHGfCM30mTC7Z9IRbmGOu0X7XpZH
rE4V2d9jSe3JXW6//QrxCmkvthnLdGwG6jLgd7bInrqcUp/wbJEFij8IUXklV/iK
anr5IyOsVqEeAd5wDNLTtY4EJY2ihubAneuF8uv0eeC1tWRWS+GHZKikg+tXUOqb
I5SWfFkGDJj+KC96GJpRzFBwYfCeqb4TCjspxvUhxYj0C8gQ2wMEMOL7K6SCCNBV
DVCaifY38XVYwpwt5/2D9XyKGKA+iFa99o+fgXfpCmNJu5rPSOAVItPNDiDaeTB2
31G1Wf9ndOHC4QPb71CEOq4iSP/c1FYRjFFuKLWvsX1XlcVoIbsXdaRKJDDdkjxb
ru58uCvYo+wNKZX9VzR6g6bVzObnGdl2j6ea8v/fSjaSAvry+1Ob1ZC9+Qt+DyZJ
Rcj6VvAA/645qJxjQ3nC/siADboN+hQbDzSL12hVjHbfXDHrFsBQQZH0Em26sqcw
RR85sMwmvPP2nccD3AhLbq800J0zMUhWqh1vcuz1+aOD//vn64KjONSeczuyQObG
tbkGIp1hU6FiYWWmL2K3
=cRXq
-----END PGP SIGNATURE-----
Merge tag 'jm_3640af68'
Tag for commit 3640af684f
# gpg: Signature made Tue 04 Aug 2015 06:17:34 AM CEST using RSA key ID 5A4C6DAD
# gpg: Good signature from "Jason Mehring (Qubes OS Signing Key) <nrgaway@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E0E3 2283 FDCA C1A5 1007 8F27 1BB9 B1FB 5A4C 6DAD
* tag 'jm_3640af68':
functions.sh: fix GLOBAL_CACHE error whay array does not yet exist
This commit is contained in:
commit
645a903995
@ -167,7 +167,7 @@ error() {
|
||||
setArrayAsGlobal() {
|
||||
local array="$1"
|
||||
local export_as="$2"
|
||||
local code=$(declare -p "$array")
|
||||
local code=$(declare -p "$array" 2> /dev/null || true)
|
||||
local replaced="${code/$array/$export_as}"
|
||||
eval ${replaced/declare -/declare -g}
|
||||
}
|
||||
@ -407,7 +407,7 @@ getFileLocations() {
|
||||
local function="templateFile"
|
||||
|
||||
unset GLOBAL_CACHE
|
||||
declare -A -g GLOBAL_CACHE
|
||||
declare -gA GLOBAL_CACHE
|
||||
|
||||
callTemplateFunction "${filename}" "${suffix}" "${function}"
|
||||
setArrayAsGlobal GLOBAL_CACHE $return_global_var
|
||||
|
Loading…
Reference in New Issue
Block a user