Merge pull request #906 from a1346054/master

Minor cleanup

README

@@ -66,7 +66,7 @@ ACKNOWLEDGEMENTS
 
 The xterm color database was copied from:
 
-  http://jonasjacek.github.io/colors/
+  https://jonasjacek.github.io/colors/
 
 
 SEE ALSO
@@ -74,4 +74,4 @@ SEE ALSO
 
 The lnav website:
 
-  http://lnav.org
+  https://lnav.org

README.md

@@ -3,7 +3,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/tstack/lnav/badge.svg?branch=master)](https://coveralls.io/github/tstack/lnav?branch=master)
 [![lnav](https://snapcraft.io//lnav/badge.svg)](https://snapcraft.io/lnav)
 
-_This is the source repository for **lnav**, visit [http://lnav.org](http://lnav.org) for a high level overview._
+_This is the source repository for **lnav**, visit [https://lnav.org](https://lnav.org) for a high level overview._
 
 # LNAV -- The Logfile Navigator
 

TESTS_ENVIRONMENT.in

@@ -140,7 +140,7 @@ check_error_output() {
 #
 # Grep for a string in the output generated by a run_test() call.
 #
-# Usage: grep_output_for <string> <fail maessage>
+# Usage: grep_output_for <string> <fail message>
 #
 # Example:
 #

docs/source/data.rst

@@ -37,7 +37,7 @@ parser will also look for pairs separated by a colon.  If there are no clearly
 demarcated pairs, then the parser will extract anything that looks like data
 values and assign them keys of the form 'col_N'.  For example, two data values,
 an IPv4 address and a symbol, will be extracted from the following log
-messsage::
+message::
 
     Apr 29 08:13:43 sample-centos5 avahi-daemon[2467]: Registering new address record for 10.1.10.62 on eth0.
 

example-scripts/clipboard.sh

@@ -1,13 +1,13 @@
-#! /bin/sh
+#!/bin/sh
 # Wrapper for various clipboard I/O on Linux desktop environments and Windows emulations thereof
 
 if [ -z "$STDIN_COPY_COMMAND" ] || [ -z "$STDOUT_PASTE_COMMAND" ]
 then
-	if [ $WAYLAND_DISPLAY ]
+	if [ -n "$WAYLAND_DISPLAY" ]
 	then
 		STDIN_COPY_COMMAND="wl-copy --foreground --type text/plain"
 		STDOUT_PASTE_COMMAND="wl-paste --no-newline"
-	elif [ $DISPLAY ]
+	elif [ -n "$DISPLAY" ]
 	then
 		if command -v xclip
 		then
@@ -34,7 +34,7 @@ then
 	then
 		STDIN_COPY_COMMAND="clip.exe"
 		STDOUT_PASTE_COMMAND=":"
-	elif [ $TMUX ]
+	elif [ -n "$TMUX" ]
 	then
 		STDIN_COPY_COMMAND="tmux load-buffer -"
 		STDOUT_PASTE_COMMAND="tmux save-buffer -"
@@ -44,7 +44,7 @@ then
 	fi > /dev/null
 fi
 
-case "$1" in
+case $1 in
 	copy) exec $STDIN_COPY_COMMAND > /dev/null 2>/dev/null ;;
 	paste) exec $STDOUT_PASTE_COMMAND < /dev/null 2>/dev/null ;;
 	"") # Try to guess intention

example-scripts/log_to_csv.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 #
 # An example script that converts messages in a syslog file into a
@@ -20,16 +20,16 @@ if test $# -lt 1; then
     exit 1
 fi
 
-if test ! -f $1; then
+if test ! -f "$1"; then
     echo "error: expecting a log file as the first argument"
     exit 1
 fi
 
 # Figure out a unique file name.
-out_file_base="$(basename $1)"
+out_file_base=$(basename "$1")
 counter=0
 while test -e "${out_file_base}.${counter}.csv"; do
-    counter=`expr ${counter} + 1`
+    counter=$((counter + 1))
 done
 export OUT_FILE="${out_file_base}.${counter}.csv"
 
@@ -63,4 +63,4 @@ lnav -nq -d /tmp/lnav.err \
         SELECT start_line FROM helper) and (SELECT max_line FROM helper)" \
     -c ':write-csv-to $OUT_FILE' \
     -c ":save-session" \
-    $1
+    "$1"

release/tail-demo.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 PAUSE_TIME=0.5
 

release/vagrant-static/build-pkg.sh

@@ -6,10 +6,10 @@ fpm --verbose \
     -s zip \
     -t rpm \
     -n "lnav" \
-    -v $VERSION \
+    -v "$VERSION" \
     -p /vagrant/ \
     -a native \
-    --url http://lnav.org \
+    --url https://lnav.org \
     -m 'timothyshanestack@gmail.com' \
     --description 'A log file viewer and analyzer for the terminal' \
     --license BSD-2-Clause \
@@ -20,10 +20,10 @@ fpm --verbose \
     -s zip \
     -t deb \
     -n "lnav" \
-    -v $VERSION \
+    -v "$VERSION" \
     -p /vagrant/ \
     -a native \
-    --url http://lnav.org \
+    --url https://lnav.org \
     -m 'timothyshanestack@gmail.com' \
     --description 'A log file viewer and analyzer for the terminal' \
     --license BSD-2-Clause \

release/vagrant-static/build.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 OS=$(uname -s)
 if test x"${OS}" != x"FreeBSD"; then
@@ -26,7 +26,7 @@ cd ~/github/lnav
 git pull
 
 if test -n "$SRC_VERSION"; then
-    git checkout $SRC_VERSION
+    git checkout "$SRC_VERSION"
 fi
 
 saved_PATH=${PATH}

release/vagrant-static/musl-pkg.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 sudo apk update && sudo apk upgrade
 sudo apk add \

release/vagrant-static/pkg.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 OS=$(uname -s)
 if test x"${OS}" != x"FreeBSD"; then

release/vagrant-static/provision.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 OS=$(uname -s)
 if test x"${OS}" != x"FreeBSD"; then
@@ -50,7 +50,7 @@ xterm-256color\
 cd ~/extract
 
 for pkg in /vagrant/pkgs/*.tar.gz; do
-    tar xfz $pkg
+    tar xfz "$pkg"
 done
 
 (cd make-4.2.1 && ./configure --prefix=${FAKE_ROOT} && make && make install)