aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-11 20:02:15 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-08-11 20:02:52 +0100
commit119c84127aa4db169fbd532877e11cc1cd3f2066 (patch)
tree309ebef6a88c4030b283a7613b3b11af2a3d044c
parent59ebf547d0096912cc7b1110926300cd5d227640 (diff)
downloadpaludis-119c84127aa4db169fbd532877e11cc1cd3f2066.tar.gz
paludis-119c84127aa4db169fbd532877e11cc1cd3f2066.tar.xz
Tighten up the quoting in default_src_{compile,install}.
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_compile.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_install.bash14
2 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_compile.bash b/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
index 183b7de..e9d8b63 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
@@ -23,7 +23,7 @@
default_src_compile()
{
if [[ -f Makefile ]] || [[ -f makefile ]] || [[ -f GNUmakefile ]] ; then
- emake ${DEFAULT_SRC_COMPILE_PARAMS[@]}
+ emake "${DEFAULT_SRC_COMPILE_PARAMS[@]}"
fi
}
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_install.bash b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
index c143f1a..a6d51ea 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_install.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
@@ -24,9 +24,9 @@ default_src_install()
{
local done_docs old_set f d p doc e
if [[ -f Makefile ]] || [[ -f makefile ]] || [[ -f GNUmakefile ]] ; then
- if make -j1 -n ${DEFAULT_SRC_INSTALL_PARAMS[@]} install ; then
+ if make -j1 -n "${DEFAULT_SRC_INSTALL_PARAMS[@]}" install ; then
echo "Found a makefile, using the install target"
- emake -j1 DESTDIR="${D}" ${DEFAULT_SRC_INSTALL_PARAMS[@]} install
+ emake -j1 DESTDIR="${D}" "${DEFAULT_SRC_INSTALL_PARAMS[@]}" install
else
die "default emake install located a makefile but no install target"
fi
@@ -36,7 +36,7 @@ default_src_install()
done_docs=
old_set=$(shopt | grep 'nocaseglob[[:space:]]*on')
shopt -s nocaseglob
- for d in '' ${DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS[@]} ; do
+ for d in '' "${DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS[@]}" ; do
if [[ -n ${d} ]]; then
[[ -d ${d} ]] || die "${d} is not a dir"
pushd "${d}" > /dev/null || die "Failed to enter ${d}"
@@ -45,11 +45,11 @@ default_src_install()
fi
for f in README Change{,s,Log} AUTHORS NEWS TODO ABOUT THANKS {KNOWN_,}BUGS SUBMITTING \
HACKING FAQ CREDITS PKG-INFO HISTORY PACKAGING MAINTAINER{,S} CONTRIBUT{E,OR,ORS} RELEASE \
- ANNOUNCE PORTING NOTES PROBLEMS NOTICE ${DEFAULT_SRC_INSTALL_EXTRA_DOCS[@]}; do
- for p in ${DEFAULT_SRC_INSTALL_EXTRA_PREFIXES[@]} '' ; do
- for doc in *([[:digit:]])${p}${f}{,+([._-])*} ; do
+ ANNOUNCE PORTING NOTES PROBLEMS NOTICE "${DEFAULT_SRC_INSTALL_EXTRA_DOCS[@]}"; do
+ for p in "${DEFAULT_SRC_INSTALL_EXTRA_PREFIXES[@]}" '' ; do
+ for doc in *([[:digit:]])"${p}${f}"{,+([._-])*} ; do
if [[ -s "${doc}" ]] ; then
- for e in ${DEFAULT_SRC_INSTALL_EXCLUDE[@]} ; do
+ for e in "${DEFAULT_SRC_INSTALL_EXCLUDE[@]}" ; do
[[ ${doc} == ${e} ]] && continue 2
done
done_docs="${done_docs} ${d%/}${d:+/}${doc}"