| 1 |
Author: grobian |
| 2 |
Date: 2008-05-01 20:30:28 +0000 (Thu, 01 May 2008) |
| 3 |
New Revision: 10064 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/subst-install.in |
| 7 |
Log: |
| 8 |
this is /bin/sh so we need to quote the hell and beyond |
| 9 |
|
| 10 |
Modified: main/branches/prefix/subst-install.in |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/subst-install.in 2008-05-01 19:20:44 UTC (rev 10063) |
| 13 |
+++ main/branches/prefix/subst-install.in 2008-05-01 20:30:28 UTC (rev 10064) |
| 14 |
@@ -10,26 +10,26 @@ |
| 15 |
case "${BASENAME}" in ""|@*@) BASENAME=basename ;; esac |
| 16 |
case "${DIRNAME}" in ""|@*@) DIRNAME=dirname ;; esac |
| 17 |
|
| 18 |
-mydir=`${DIRNAME} $0` |
| 19 |
-myname=`${BASENAME} $0` |
| 20 |
-mydir=`cd ${mydir};pwd` |
| 21 |
-me=${mydir}/${myname} |
| 22 |
+mydir="`${DIRNAME} $0`" |
| 23 |
+myname="`${BASENAME} $0`" |
| 24 |
+mydir="`cd ${mydir};pwd`" |
| 25 |
+me="${mydir}/${myname}" |
| 26 |
|
| 27 |
. ${mydir}/subst-install.vars |
| 28 |
|
| 29 |
-substinstall_tmpdir=${TMPDIR-/tmp}/${myname}.$$ |
| 30 |
+substinstall_tmpdir="${TMPDIR-/tmp}/${myname}.$$" |
| 31 |
trap "${RM} -rf \${substinstall_tmpdir}" "0" |
| 32 |
-mkdir -p ${substinstall_tmpdir} \ |
| 33 |
+mkdir -p "${substinstall_tmpdir}" \ |
| 34 |
|| { echo "cannot create directory ${substinstall_tmpdir}" >&2 ; exit 1 ; } |
| 35 |
|
| 36 |
-substinstall_tmpsed=${substinstall_tmpdir}/sedscript |
| 37 |
+substinstall_tmpsed="${substinstall_tmpdir}/sedscript" |
| 38 |
|
| 39 |
{ for v in ${all_configurevars} |
| 40 |
do |
| 41 |
eval "echo \"s,@${v}@,\${${v}},g;\"" |
| 42 |
done |
| 43 |
-} | ${SED} 's/^s,@/s@@/; s/@,/@@/; s/,g;$/@;/; s/[\\&,]/\\&/g; |
| 44 |
- s/^s@@/s,@/; s/@@/@,/; s/@;$/,g;/' > ${substinstall_tmpsed} |
| 45 |
+} | "${SED}" 's/^s,@/s@@/; s/@,/@@/; s/,g;$/@;/; s/[\\&,]/\\&/g; |
| 46 |
+ s/^s@@/s,@/; s/@@/@,/; s/@;$/,g;/' > "${substinstall_tmpsed}" |
| 47 |
|
| 48 |
substinstall_installcmd= |
| 49 |
substinstall_sources= |
| 50 |
@@ -37,15 +37,15 @@ |
| 51 |
|
| 52 |
while [ "$1" ] |
| 53 |
do |
| 54 |
- substinstall_arg=$1 |
| 55 |
+ substinstall_arg="$1" |
| 56 |
shift |
| 57 |
case "${substinstall_arg}" in |
| 58 |
--installcmd=*) |
| 59 |
- substinstall_installcmd=`echo ${substinstall_arg} | ${SED} -e 's,^--installcmd=,,'` |
| 60 |
+ substinstall_installcmd=`echo "${substinstall_arg}" | "${SED}" -e 's,^--installcmd=,,'` |
| 61 |
;; |
| 62 |
*) |
| 63 |
substinstall_sources="${substinstall_sources} ${substinstall_target}" |
| 64 |
- substinstall_target=${substinstall_arg} |
| 65 |
+ substinstall_target="${substinstall_arg}" |
| 66 |
;; |
| 67 |
esac |
| 68 |
done |
| 69 |
@@ -56,17 +56,17 @@ |
| 70 |
|
| 71 |
for substinstall_s in ${substinstall_sources} |
| 72 |
do |
| 73 |
- [ -r ${substinstall_s} ] || { echo "cannot read ${substinstall_s}" >&2 ; exit 1 ; } |
| 74 |
- tmpsource=${substinstall_tmpdir}/`basename ${substinstall_s}`.subst |
| 75 |
- ${SED} -f ${substinstall_tmpsed} < ${substinstall_s} > ${tmpsource} \ |
| 76 |
+ [ -r "${substinstall_s}" ] || { echo "cannot read ${substinstall_s}" >&2 ; exit 1 ; } |
| 77 |
+ tmpsource="${substinstall_tmpdir}/`basename ${substinstall_s}`.subst" |
| 78 |
+ "${SED}" -f "${substinstall_tmpsed}" < "${substinstall_s}" > "${tmpsource}" \ |
| 79 |
|| { echo "cannot sed from ${substinstall_s} to ${tmpsource}" >&2 ; exit 1 ; } |
| 80 |
substinstall_tmpsources="${substinstall_tmpsources} ${tmpsource}" |
| 81 |
done |
| 82 |
|
| 83 |
-${substinstall_installcmd} ${substinstall_tmpsources} ${substinstall_target} |
| 84 |
+eval "${substinstall_installcmd} ${substinstall_tmpsources} ${substinstall_target}" |
| 85 |
|
| 86 |
substinstall_installrv=$? |
| 87 |
|
| 88 |
-${RM} -rf ${substinstall_tmpdir} |
| 89 |
+"${RM}" -rf "${substinstall_tmpdir}" |
| 90 |
|
| 91 |
exit ${substinstall_installrv} |
| 92 |
|
| 93 |
-- |
| 94 |
gentoo-commits@l.g.o mailing list |
Archives