summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/alpha/common/list12
-rw-r--r--distrib/alpha/list2sh.awk8
-rw-r--r--distrib/hp300/list2sh.awk8
-rw-r--r--distrib/hp300/ramdisk/list14
-rw-r--r--distrib/mac68k/list2sh.awk8
-rw-r--r--distrib/mac68k/ramdisk/list14
-rw-r--r--distrib/mvme68k/list2sh.awk8
-rw-r--r--distrib/mvme68k/ramdisk/list16
-rw-r--r--distrib/mvme88k/list2sh.awk8
-rw-r--r--distrib/mvme88k/miniroot/list4
-rw-r--r--distrib/mvme88k/ramdisk/list4
-rw-r--r--distrib/mvmeppc/list2sh.awk8
-rw-r--r--distrib/powerpc/list2sh.awk8
-rw-r--r--distrib/powerpc/ramdisk/list4
-rw-r--r--distrib/vax/list2sh.awk8
15 files changed, 58 insertions, 74 deletions
diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index 67c041c44e5..c0f62060c06 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.2 2001/06/23 19:44:34 deraadt Exp $
+# $OpenBSD: list,v 1.3 2001/08/29 15:01:17 krw Exp $
# we strip comments from files since we need the space...
@@ -6,10 +6,10 @@
#SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/disktab.preinstall > etc/disktab.preinstall
# and the installation tools
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/dot.profile > .profile
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/disktab.shadow > etc/disktab.shadow
-SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../common/dot.profile > .profile
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../common/disktab.shadow > etc/disktab.shadow
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md
SPECIAL chmod 755 install
#SPECIAL chmod 755 upgrade
diff --git a/distrib/alpha/list2sh.awk b/distrib/alpha/list2sh.awk
index 9b9f9b596b0..078e597c20a 100644
--- a/distrib/alpha/list2sh.awk
+++ b/distrib/alpha/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.3 1997/05/16 02:27:10 millert Exp $
+# $OpenBSD: list2sh.awk,v 1.4 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -52,10 +52,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/hp300/list2sh.awk b/distrib/hp300/list2sh.awk
index b9c00864228..078e597c20a 100644
--- a/distrib/hp300/list2sh.awk
+++ b/distrib/hp300/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.3 1998/03/28 23:40:45 millert Exp $
+# $OpenBSD: list2sh.awk,v 1.4 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -52,10 +52,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 4cf54306463..bce1cde98d1 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.19 2001/06/23 19:44:40 deraadt Exp $
+# $OpenBSD: list,v 1.20 2001/08/29 15:01:17 krw Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
@@ -75,12 +75,12 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/dot.commonutils > .commonutils
SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/termcap.hp-vt > usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.profile > .profile
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.instutils > .instutils
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.profile > .profile
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.instutils > .instutils
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" -e '/^[ ]*#$/d' < ${CURDIR}/install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
+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/mac68k/list2sh.awk b/distrib/mac68k/list2sh.awk
index 14b8582b743..62919dc39b9 100644
--- a/distrib/mac68k/list2sh.awk
+++ b/distrib/mac68k/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.2 1999/06/13 10:33:30 downsj Exp $
+# $OpenBSD: list2sh.awk,v 1.3 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -52,10 +52,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list
index c55cd9e3254..a248d5d462b 100644
--- a/distrib/mac68k/ramdisk/list
+++ b/distrib/mac68k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.4 2001/06/23 19:44:45 deraadt Exp $
+# $OpenBSD: list,v 1.5 2001/08/29 15:01:17 krw Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
@@ -74,12 +74,12 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/dot.commonutils > .commonutils
SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.profile > .profile
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.instutils > .instutils
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../install.md > install.md
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.profile > .profile
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.instutils > .instutils
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
+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/mvme68k/list2sh.awk b/distrib/mvme68k/list2sh.awk
index 3789ef1afb3..a2b68db47bf 100644
--- a/distrib/mvme68k/list2sh.awk
+++ b/distrib/mvme68k/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.2 2000/01/24 04:50:25 smurph Exp $
+# $OpenBSD: list2sh.awk,v 1.3 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -52,10 +52,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list
index 2728162d367..94f9c299d24 100644
--- a/distrib/mvme68k/ramdisk/list
+++ b/distrib/mvme68k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.9 2001/07/26 20:21:17 deraadt Exp $
+# $OpenBSD: list,v 1.10 2001/08/29 15:01:17 krw Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
SRCDIRS usr.sbin/pppd
@@ -93,12 +93,12 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/dot.commonutils > .commonutils
SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.profile > .profile
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.instutils > .instutils
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/install.sub > install.sub
-#SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.profile > .profile
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.instutils > .instutils
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/install.sub > install.sub
+#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/mvme88k/list2sh.awk b/distrib/mvme88k/list2sh.awk
index 749c0c98c7d..55dcac08756 100644
--- a/distrib/mvme88k/list2sh.awk
+++ b/distrib/mvme88k/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.1 1998/12/17 02:16:30 smurph Exp $
+# $OpenBSD: list2sh.awk,v 1.2 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -20,10 +20,8 @@ $1 == "LINK" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index 1d41f3dd1a5..72d5da6deef 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.3 2001/06/23 19:44:48 deraadt Exp $
+# $OpenBSD: list,v 1.4 2001/08/29 15:01:17 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Amiga extra's
@@ -39,4 +39,4 @@ SYMLINK /tmp/hosts etc/hosts
# and the installation tools
COPY ${ARCHDIR}/dot.profile .profile
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch`" < ${ARCHDIR}/../install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch`" < ${ARCHDIR}/../install.md > install.md
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index 292c5cf7dc8..3c17fdba39d 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 2001/06/23 19:44:50 deraadt Exp $
+# $OpenBSD: list,v 1.6 2001/08/29 15:01:17 krw Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
@@ -86,7 +86,7 @@ LINK sbin/init usr/bin/vi
COPY dot.profile .profile
COPY dot.instutils .instutils
COPY install.sh install
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
COPY install.sub install.sub
COPY disktab.shadow etc/disktab.shadow
COPY ${DESTDIR}/usr/mdec/installboot usr/mdec
diff --git a/distrib/mvmeppc/list2sh.awk b/distrib/mvmeppc/list2sh.awk
index be8571deb52..d3faf9adab3 100644
--- a/distrib/mvmeppc/list2sh.awk
+++ b/distrib/mvmeppc/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.1 2001/06/26 22:23:23 smurph Exp $
+# $OpenBSD: list2sh.awk,v 1.2 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -52,10 +52,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/powerpc/list2sh.awk b/distrib/powerpc/list2sh.awk
index a14e783031d..a2b68db47bf 100644
--- a/distrib/powerpc/list2sh.awk
+++ b/distrib/powerpc/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.2 1997/10/10 10:34:39 pefo Exp $
+# $OpenBSD: list2sh.awk,v 1.3 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -52,10 +52,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list
index 20e794c7464..f24c1049954 100644
--- a/distrib/powerpc/ramdisk/list
+++ b/distrib/powerpc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.23 2001/06/26 23:50:38 drahn Exp $
+# $OpenBSD: list,v 1.24 2001/08/29 15:01:17 krw Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -97,7 +97,7 @@ COPY ${TOPDIR}/common/termcap.vt usr/share/misc/termcap
# and the installation tools
COPY dot.profile .profile
-SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
+SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md
COPY ${CURDIR}/../../miniroot/install.sh install
COPY ${CURDIR}/../../miniroot/upgrade.sh upgrade
#SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub
diff --git a/distrib/vax/list2sh.awk b/distrib/vax/list2sh.awk
index 2ad8bb69416..9319f40e0ad 100644
--- a/distrib/vax/list2sh.awk
+++ b/distrib/vax/list2sh.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: list2sh.awk,v 1.4 2001/02/24 10:55:02 hugh Exp $
+# $OpenBSD: list2sh.awk,v 1.5 2001/08/29 15:01:17 krw Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -48,10 +48,8 @@ $1 == "COPYDIR" {
}
$1 == "SPECIAL" {
printf("echo '%s'\n", $0);
- printf("(cd ${TARGDIR};");
- for (i = 2; i <= NF; i++)
- printf(" %s", $i);
- printf(")\n");
+ sub(/^[ \t]*SPECIAL[ \t]*/, "");
+ printf("(cd ${TARGDIR}; %s)\n", $0);
next;
}
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 09:22:32 +0000