diff options
| author | gpalmer <gpalmer@FreeBSD.org> | 1995-04-13 09:30:58 +0000 |
|---|---|---|
| committer | gpalmer <gpalmer@FreeBSD.org> | 1995-04-13 09:30:58 +0000 |
| commit | 8e8b125da97c80f30ce95c7a17fac7cda8203951 (patch) | |
| tree | 32bd09493a26519ce87392ee3d89df3804b289e1 /release/scripts | |
| parent | 84030e5de80b2f9f631c9603d8f20951390b5da8 (diff) | |
| download | FreeBSD-src-8e8b125da97c80f30ce95c7a17fac7cda8203951.zip FreeBSD-src-8e8b125da97c80f30ce95c7a17fac7cda8203951.tar.gz | |
The tmpdir cleaning routine _still_ wasn't right! :-(
I think this truly fixes it.
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/instdist.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/release/scripts/instdist.sh b/release/scripts/instdist.sh index 15fef2d..969a690 100644 --- a/release/scripts/instdist.sh +++ b/release/scripts/instdist.sh @@ -10,7 +10,7 @@ # putting your name on top after doing something trivial like reindenting # it, just to make it look like you wrote it!). # -# $Id: instdist.sh,v 1.17 1995/04/09 08:56:02 jkh Exp $ +# $Id: instdist.sh,v 1.18 1995/04/09 09:01:56 jkh Exp $ if [ "${_INSTINST_SH_LOADED_}" = "yes" ]; then return 0 @@ -189,11 +189,6 @@ the files yourself."; then return 1; fi media_extract_dist() { - if [ ! -f do_cksum.sh ]; then - if [ -f ${MEDIA_DISTRIBUTION}/do_cksum.sh ]; then - cd ${MEDIA_DISTRIBUTION} - fi - fi if [ -f do_cksum.sh ]; then message "Verifying checksums for ${MEDIA_DISTRIBUTION} distribution. Please wait!" if sh ./do_cksum.sh; then @@ -223,7 +218,7 @@ media_install_set() if [ -f ${TMPDIR}/${MEDIA_DISTRIBUTION}/extract.sh ]; then cd ${TMPDIR}/${MEDIA_DISTRIBUTION} media_extract_dist - cd / + media_rm_tmpdir return fi case ${MEDIA_TYPE} in @@ -233,7 +228,6 @@ media_install_set() media_reset else media_extract_dist - cd / fi return ;; @@ -289,6 +283,7 @@ media_install_set() if ! echo ${MEDIA_DEVICE} | grep -q -v 'ftp://'; then message "Fetching ${MEDIA_DISTRIBUTION} distribution over ftp.\nUse ALT-F2 to see output, ALT-F1 to return." mkdir -p ${MEDIA_DISTRIBUTION} + cd ${MEDIA_DISTRIBUTION} if ! ncftp ${MEDIA_DEVICE}/${MEDIA_DISTRIBUTION}/* < /dev/null > /dev/ttyv1 2>&1; then error "Couldn't fetch ${MEDIA_DISTRIBUTION} distribution from\n${MEDIA_DEVICE}!" else |
