Mon Mar 18 11:24:43 2013 UTC ()
Use `` instead of $(), fixes bootstrap on older SunOS versions which have
the legacy /bin/sh.

Fix from asau.


(jperkin)
diff -r1.3 -r1.4 pkgsrc/pkgtools/bootstrap-mk-files/files/bootstrap.sh
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/bootstrap-mk-files/files/bootstrap.sh (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/bootstrap.sh 2013/02/23 23:52:32 1.3
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/bootstrap.sh 2013/03/18 11:24:42 1.4
@@ -4,29 +4,29 @@ @@ -4,29 +4,29 @@
4# 4#
5# Expected environment: 5# Expected environment:
6# - CP 6# - CP
7# - OPSYS 7# - OPSYS
8# - MK_DST 8# - MK_DST
9# - ROOT_GROUP 9# - ROOT_GROUP
10# - ROOT_USER 10# - ROOT_USER
11# - SED 11# - SED
12# - SYSCONFDIR 12# - SYSCONFDIR
13# 13#
14 14
15: ${CP:=cp} 15: ${CP:=cp}
16: ${SED:=sed} 16: ${SED:=sed}
17: ${OPSYS:=$(uname)} 17: ${OPSYS:=`uname`}
18: ${ROOT_USER:=$(id -un 0)} 18: ${ROOT_USER:=`id -un 0`}
19: ${ROOT_GROUP:=$(id -gn "${ROOT_USER}")} 19: ${ROOT_GROUP:=`id -gn "${ROOT_USER}"`}
20: ${MK_DST:=/usr/local/share/mk} 20: ${MK_DST:=/usr/local/share/mk}
21: ${SYSCONFDIR:=/usr/local/etc} 21: ${SYSCONFDIR:=/usr/local/etc}
22 22
23for file in bsd.README bsd.dep.mk bsd.depall.mk bsd.doc.mk bsd.files.mk \ 23for file in bsd.README bsd.dep.mk bsd.depall.mk bsd.doc.mk bsd.files.mk \
24 bsd.hostprog.mk bsd.inc.mk bsd.info.mk bsd.kernobj.mk bsd.kinc.mk \ 24 bsd.hostprog.mk bsd.inc.mk bsd.info.mk bsd.kernobj.mk bsd.kinc.mk \
25 bsd.kmod.mk bsd.lib.mk bsd.links.mk bsd.man.mk bsd.nls.mk \ 25 bsd.kmod.mk bsd.lib.mk bsd.links.mk bsd.man.mk bsd.nls.mk \
26 bsd.obj.mk bsd.prog.mk bsd.subdir.mk bsd.sys.mk sys.mk; do 26 bsd.obj.mk bsd.prog.mk bsd.subdir.mk bsd.sys.mk sys.mk; do
27 if [ -f mods/${OPSYS}.${file} ]; then 27 if [ -f mods/${OPSYS}.${file} ]; then
28 ${CP} mods/${OPSYS}.${file} ${MK_DST}/${file} 28 ${CP} mods/${OPSYS}.${file} ${MK_DST}/${file}
29 else 29 else
30 ${CP} ${file} ${MK_DST}/${file} 30 ${CP} ${file} ${MK_DST}/${file}
31 fi 31 fi
32done 32done