summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-02-10 05:05:41 +0000
committerjkh <jkh@FreeBSD.org>1995-02-10 05:05:41 +0000
commitc8a99599521b1b9c27886b319521e8b7628e16ef (patch)
tree5c8b11dbef7a58dbe06c49675e62608f30fa52c2 /release
parentb4f4d1d779aa840fda1182f71f42ea78c48e87a6 (diff)
downloadFreeBSD-src-c8a99599521b1b9c27886b319521e8b7628e16ef.zip
FreeBSD-src-c8a99599521b1b9c27886b319521e8b7628e16ef.tar.gz
On second thought, only do extract if select returns success.
Diffstat (limited to 'release')
-rwxr-xr-xrelease/scripts/extract_xf86311.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/extract_xf86311.sh b/release/scripts/extract_xf86311.sh
index c8a65af..1c2af07 100755
--- a/release/scripts/extract_xf86311.sh
+++ b/release/scripts/extract_xf86311.sh
@@ -9,12 +9,12 @@
# under the terms and conditions stated by the XFree86 Project, Inc.
# copyright, which should also be in the file COPYRIGHT in this distribution.
#
-# $Id: extract_xf86311.sh,v 1.4 1995/02/10 04:53:01 jkh Exp $
+# $Id: extract_xf86311.sh,v 1.5 1995/02/10 05:02:33 jkh Exp $
PATH=/usr/X11R6/bin:/usr/X386/bin:.:$PATH
-X11PREFIX= /usr/X11R6
-XRELEASE= "XFree86 3.1.1"
+X11PREFIX=/usr/X11R6
+XRELEASE="XFree86 3.1.1"
# Handle the return value from a dialog, doing some pre-processing
# so that each client doesn't have to.
@@ -93,6 +93,7 @@ Server notation: 4 bit = 16 color, 8 bit = 256 color,\n\
2> ${TMP}/X-selections.$$
RETVAL=$?
SELECTIONS=`cat ${TMP}/X-selections.$$`
+ return ${RETVAL}
}
INSTALLING=yes
@@ -118,7 +119,7 @@ recommended that choices be followed in order on this menu," \
COPYRIGHT) dialog --title "COPYRIGHT NOTICE" --textbox COPYRIGHT 20 78 ;;
README) dialog --title "${XRELEASE} README" --textbox README 20 78 ;;
FreeBSD) dialog --title "XFree86 and FreeBSD" --textbox README.FreeBSD 20 78 ;;
- Install) do_select_menu; do_selected_install ;;
+ Install) if do_select_menu; then do_selected_install; fi ;;
Configure) do_configure ;;
startx)
if [ -x ${X11PREFIX}/bin/startx ]; then
OpenPOWER on IntegriCloud