diff options
author | jkh <jkh@FreeBSD.org> | 1994-11-12 09:55:29 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1994-11-12 09:55:29 +0000 |
commit | 9efef549e28bf8e556d5a1e4f2834bf71c2d72c9 (patch) | |
tree | 76bdfa11aae8e2f9396a94ddf730c8d847ea9712 /release | |
parent | 8ddc202ee3e9cefd48e2a983be367960c4dc3bcc (diff) | |
download | FreeBSD-src-9efef549e28bf8e556d5a1e4f2834bf71c2d72c9.zip FreeBSD-src-9efef549e28bf8e556d5a1e4f2834bf71c2d72c9.tar.gz |
When this is run manually, the myname protection stuff probably isn't
needed in all cases. Guard against this.
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile | 4 | ||||
-rw-r--r-- | release/extract.sh | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile index 7d1ca4c..3bd569b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.36 1994/11/12 02:25:04 jkh Exp $ +# $Id: Makefile,v 1.37 1994/11/12 05:47:28 phk Exp $ # # Evil floppies are, of course, 1.2MB floppies. @@ -122,7 +122,7 @@ release20: ( cd ${.CURDIR}/../etc ; \ ${MAKE} distribution DESTDIR=${RELEASEDIR}/filesys \ NOCRYPT=yes SHARED=copies) - (cd ${RELEASEDIR/filesys}; \ + (cd ${RELEASEDIR}/filesys; \ tar cf - . | \ ${ZIPNSPLIT} ${RELEASEDIR}/tarballs/bindist/bin_tgz.) cp ${.CURDIR}/extract.sh ${RELEASEDIR}/tarballs/bindist diff --git a/release/extract.sh b/release/extract.sh index 06ada6e..e94b641 100644 --- a/release/extract.sh +++ b/release/extract.sh @@ -1,18 +1,22 @@ #!/bin/sh -# $Id: extract.sh,v 1.8 1994/11/10 03:22:27 phk Exp $ +# $Id: extract.sh,v 1.9 1994/11/11 23:27:05 jkh Exp $ DDIR=/ if [ -f bin_tgz.aa ] ; then # Temporary kludge for pathological bindist. - cp $DDIR/etc/hosts $DDIR/etc/myname $DDIR/stand/etc + if [ -f $DDIR/etc/myname ]; then + cp $DDIR/etc/hosts $DDIR/etc/myname $DDIR/stand/etc + fi echo; echo "Extracting bindist, please wait. Ignore any messages from" echo "cpio saying \"No such file or directory\". It doesn't know what" echo "it's talking about.."; echo cat bin_tgz.?? | zcat | ( cd $DDIR ; cpio -H tar -idumV ) - # Add back what the bindist nuked. - cp $DDIR/stand/etc/myname $DDIR/etc - cat $DDIR/stand/etc/hosts >> $DDIR/etc/hosts + if [ -f $DDIR/stand/etc/myname ]; then + # Add back what the bindist nuked. + cp $DDIR/stand/etc/myname $DDIR/etc + cat $DDIR/stand/etc/hosts >> $DDIR/etc/hosts + fi fi for i in *.aa |