Permalink
Browse files

Clean up

  • Loading branch information...
Stephen Bach
Stephen Bach committed Sep 16, 2008
1 parent c0b41cc commit 48b1ba2b86d4a403e42dd453528e1b27419c3abb
Showing with 14 additions and 14 deletions.
  1. +10 −9 shell/init-viewglob.zshrc.in
  2. +4 −5 shell/viewglob.in
@@ -31,16 +31,17 @@ if [ "$VG_SANDBOX" = yep ]; then
# This is all for the sandbox shell.
# We have to disable this stuff because...
- # History expansion is a no-go.
- # The NOMATCH error message prevents vgexpand from running.
- # Global aliases could be dangerous to the filesystem, and they can't be
- # disabled without disabling all aliases (AFAIK).
- # No spell check!
- # BAD_PATTERN can prevent vgexpand from running.
- # The sandbox should NEVER modify the file system, but turn off
+ # - History expansion is a no-go.
+ # - The NOMATCH error message prevents vgexpand from running.
+ # - Global aliases could be dangerous to the filesystem, and they can't
+ # be disabled without disabling all aliases (AFAIK).
+ # - No spell check!
+ # - BAD_PATTERN can prevent vgexpand from running.
+ # - The sandbox should NEVER modify the file system, but turn off
# clobbering and star_silent just in case.
- # Don't save history in the sandbox.
- # The user could put setopt zle in their .zshrc, overriding seer's +Z.
+ # - Don't save history in the sandbox.
+ # - The user could put setopt zle in their .zshrc, overriding vgseer's
+ # +Z.
setopt \
NO_BANG_HIST \
NO_NOMATCH \
View
@@ -16,6 +16,9 @@
# along with Viewglob; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# We need extended globbing.
+shopt -s extglob
+
SCRIPT_NAME="${0##*/}"
VG_LIB_DIR="@pkglibdir@"
VGPING="$VG_LIB_DIR/vgping"
@@ -29,9 +32,6 @@ VGSEER_OPTS=
VGSEER_EXEC=vgseer
VGD_OPTS=
-# We need extended globbing.
-shopt -s extglob
-
vg_usage() {
cat >&2 << EOF
usage: viewglob [-h <host>] [-p <port>] [-c <shell mode>] [-d <display>]
@@ -293,8 +293,7 @@ else
VGSEER_OPTS="$VGSEER_OPTS --unix-socket=off"
if ! $VGPING $HOST $PORT ; then
- vg_error "Couldn't handshake with a vgd at \
- ${HOST}:${PORT}" 6
+ vg_error "Couldn't handshake with a vgd at ${HOST}:${PORT}" 6
fi
exec $VGSEER_EXEC $VGSEER_OPTS --unix-socket=off

0 comments on commit 48b1ba2

Please sign in to comment.