diff options
| -rw-r--r-- | distrib/i386/floppies/common/list | 12 | ||||
| -rw-r--r-- | distrib/i386/floppies/list2sh.awk | 6 | ||||
| -rw-r--r-- | distrib/i386/floppies/ramdiskC/list | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list index 3b4a3eae66c..7b5691dd4d4 100644 --- a/distrib/i386/floppies/common/list +++ b/distrib/i386/floppies/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2001/06/23 19:44:42 deraadt Exp $ +# $OpenBSD: list,v 1.21 2001/08/23 02:37:02 krw Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -82,9 +82,9 @@ COPY ${CURDIR}/../common/termcap.vt usr/share/misc/termcap #COPY ${DESTDIR}/usr/share/misc/scsi_modes usr/share/misc/scsi_modes # and the installation tools -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/dot.profile > .profile -SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/install.sh > install -SPECIAL sed -e '/^#[ ].*$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../common/dot.profile > .profile +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../../miniroot/install.sh > install +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub SPECIAL chmod 755 install upgrade diff --git a/distrib/i386/floppies/list2sh.awk b/distrib/i386/floppies/list2sh.awk index 59a2e5bdaf8..9b8a0dc562e 100644 --- a/distrib/i386/floppies/list2sh.awk +++ b/distrib/i386/floppies/list2sh.awk @@ -1,4 +1,4 @@ -# $OpenBSD: list2sh.awk,v 1.5 1997/05/08 15:50:29 tholo Exp $ +# $OpenBSD: list2sh.awk,v 1.6 2001/08/23 02:37:02 krw Exp $ BEGIN { printf("cd ${CURDIR}\n"); @@ -53,8 +53,8 @@ $1 == "COPYDIR" { $1 == "SPECIAL" { printf("echo '%s'\n", $0); printf("(cd ${TARGDIR};"); - for (i = 2; i <= NF; i++) - printf(" %s", $i); + sub(/^[ \t]*SPECIAL[ \t]*/, ""); + printf(" %s", $0); printf(")\n"); next; } diff --git a/distrib/i386/floppies/ramdiskC/list b/distrib/i386/floppies/ramdiskC/list index 206e6bb38fa..0ef65bae4e7 100644 --- a/distrib/i386/floppies/ramdiskC/list +++ b/distrib/i386/floppies/ramdiskC/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.4 2001/08/17 13:58:21 krw Exp $ +# $OpenBSD: list,v 1.5 2001/08/23 02:37:02 krw Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -84,9 +84,9 @@ COPY ${CURDIR}/../common/termcap.vt usr/share/misc/termcap #COPY ${DESTDIR}/usr/share/misc/scsi_modes usr/share/misc/scsi_modes # and the installation tools -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/dot.profile > .profile -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/install.md > install.md -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/install.sh > install -SPECIAL sed -e '/^#[ ].*$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../common/dot.profile > .profile +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../../miniroot/install.sh > install +SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub SPECIAL chmod 755 install upgrade |