summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2001-12-23 16:54:05 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2001-12-23 16:54:05 +0000
commitc07ff72b6f5508111eac542a0694684d45f40b82 (patch)
treea87ab1de542cf558ba86e9a551216ceac34e0381
parenta954b5a48124a9d905458e72f12287ec05ec48d1 (diff)
Some minor typographical adjustments:
a) Indent encode_for_url() in install.sub with tabs not spaces b) delete a couple of extra blank lines c) delete a few unnecessary ';'s at the end of lines d) delete a few unnecessary '"'s around values assigned to resp (e.g. 'resp="X"' to 'resp=X'
-rw-r--r--distrib/miniroot/install.sh5
-rw-r--r--distrib/miniroot/install.sub37
2 files changed, 20 insertions, 22 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 74c805ed59e..275394eb799 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sh,v 1.81 2001/11/25 19:40:51 krw Exp $
+# $OpenBSD: install.sh,v 1.82 2001/12/23 16:54:04 krw Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2001 Todd Miller, Theo de Raadt, Ken Westerback
@@ -127,7 +127,6 @@ else
esac
fi
-
echo "You can run a shell command at any prompt via '!foo'"
echo "or escape to a shell by simply typing '!'."
echo
@@ -208,7 +207,7 @@ __get_filesystems_1
# Now prompt the user for the mount points. Loop until "done"
echo
_i=0
- resp="X"
+ resp=X
while [ $_npartitions -gt 0 -a X${resp} != X"done" ]; do
_pp=${_partitions[${_i}]}
_ps=$(( ${_psizes[${_i}]} / 2 ))
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 14b4394fdcf..8887a85f040 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sub,v 1.181 2001/12/22 18:53:45 krw Exp $
+# $OpenBSD: install.sub,v 1.182 2001/12/23 16:54:04 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -439,7 +439,7 @@ boot program (especially on a PC with multiple disk controllers).
Available disks are:
__EOT
- local _defdsk;
+ local _defdsk
_DKDEVS=`md_get_diskdevs`
_defdsk=`echo $_DKDEVS | cutlast`
@@ -862,7 +862,6 @@ enable_network() {
return 0
}
-
# Print the selector and get a response
# The list of sets is passed in as $1, sets $resp
get_selection() {
@@ -946,17 +945,17 @@ OOF
}
encode_for_url() {
- # Encode $1 as specified for usercodes and passwords in RFC 1738
- # section 3.1, and now supported by our in-tree ftp:
- #
- # ':' -> '%3a'
- # '@' -> '%40'
- # '/' -> '%2f'
- #
- # *NOTE* quotes around $1 are required to preserve trailing or
- # embeddded blanks in usercodes and passwords!
-
- echo "$1" | sed -e 's/:/%3a/g' -e 's/@/%40/g' -e 's/\//%2f/g'
+ # Encode $1 as specified for usercodes and passwords in RFC 1738
+ # section 3.1, and now supported by our in-tree ftp:
+ #
+ # ':' -> '%3a'
+ # '@' -> '%40'
+ # '/' -> '%2f'
+ #
+ # *NOTE* quotes around $1 are required to preserve trailing or
+ # embeddded blanks in usercodes and passwords!
+
+ echo "$1" | sed -e 's/:/%3a/g' -e 's/@/%40/g' -e 's/\//%2f/g'
}
install_url() {
@@ -1928,7 +1927,7 @@ while : ; do
"")
echo "Timezone defaults to GMT"
TZ="GMT"
- break;
+ break
;;
"?")
ls -F ${_zonepath}/usr/share/zoneinfo
@@ -1944,7 +1943,7 @@ while : ; do
"?") ls -F ${_zonepath}/usr/share/zoneinfo/$_a ;;
*) _a=${_a}/${resp}
if [ -f ${_zonepath}/usr/share/zoneinfo/$_a ]; then
- break;
+ break
fi
;;
esac
@@ -1982,7 +1981,7 @@ Something needed to complete the installation seems to be missing, did you
forget to extract a required set?
__EOT
else
- return 0;
+ return 0
fi
cat << __EOT
@@ -2335,7 +2334,7 @@ donetconfig() {
if [ -f /tmp/mygate ]; then
resp=`cat /etc/mygate`
if [ "X${resp}" = "X" ]; then
- resp="none";
+ resp=none
fi
fi
fi
@@ -2348,7 +2347,7 @@ donetconfig() {
fi
fi
- resp="none"
+ resp=none
if [ -f /tmp/resolv.conf ]; then
resp=
for n in `grep '^nameserver ' /tmp/resolv.conf | \