From 03fd7cc52d0902daece0ccbcb369dd50bba068de Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:45:51 +0000 Subject: [PATCH] [example files]: fix shellcheck identified issues --- example-scripts/clipboard.sh | 10 +++++----- example-scripts/log_to_csv.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example-scripts/clipboard.sh b/example-scripts/clipboard.sh index 0c7d57a4..2cdd0165 100755 --- a/example-scripts/clipboard.sh +++ b/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 diff --git a/example-scripts/log_to_csv.sh b/example-scripts/log_to_csv.sh index 995562d0..70117dd2 100755 --- a/example-scripts/log_to_csv.sh +++ b/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 @@ -8,7 +8,7 @@ # # NOTE: lnav is going to save some state in $HOME; you might want to change # $HOME to something else... -# +# # NOTE 2: Unfortunately, this is pretty inefficient right now since lnav # is going to store the entire log file in memory when processing the # result of the SQL SELECT. @@ -29,19 +29,19 @@ fi 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" # Here's a quick summary of what this is doing: -# +# # 1. ':load-session' will load the session data which stores which lines # are bookmarked in a file. We're using bookmarks to keep track of the # last line that we converted in a previous run of this script. # 2. ';CREATE TABLE helper' creates a temporary table that we use to store # the range of messages that we'll be converting. # 3. ';INSERT INTO helper' will figure out the range of lines in syslog file -# to convert. +# to convert. # 4. ';UPDATE syslog_log' will set a bookmark on the last line of the range # we computed in the previous step. # 5. ';SELECT *' will pull all of the log messages in the computed range.