From 1a38490649d4e61673ebff3618284ae06481c6e8 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Mon, 11 Mar 2024 00:25:59 -0700 Subject: [PATCH] fix shellcheck errors in 2004/hibachi/src/localhost/test/shell/test0.sh --- .../hibachi/src/localhost/test/shell/test0.sh | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/2004/hibachi/src/localhost/test/shell/test0.sh b/2004/hibachi/src/localhost/test/shell/test0.sh index 73d7671d1..dc4be5239 100755 --- a/2004/hibachi/src/localhost/test/shell/test0.sh +++ b/2004/hibachi/src/localhost/test/shell/test0.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash cat <<'-EOT-' HTTP/1.0 200 OK @@ -27,58 +27,61 @@ Hibachi/1.0 Shell Test 0 - Display Enviroment

Assertions

-EOT- -if [ X"$PATH" = X'/usr/local/bin:/usr/bin:/bin' ]; then +if [[ "$PATH" == '/usr/local/bin:/usr/bin:/bin' ]]; then echo "[ OK ] PATH" else echo "[ BAD ] PATH" fi -if [ X"$ENV" = X ]; then +if [[ -z $ENV ]]; then echo "[ OK ] ENV" else echo "[ BAD ] ENV" fi -if [ X"$CDPATH" = X ]; then +if [[ -z $CDPATH ]]; then echo "[ OK ] CDPATH" else echo "[ BAD ] CDPATH" fi -if [ X"$REQUEST_METHOD" = X'GET' ]; then +if [[ -z $REQUEST_METHOD ]]; then REQUEST_METHOD=''; fi +if [[ $REQUEST_METHOD == 'GET' ]]; then echo "[ OK ] REQUEST_METHOD" else echo "[ BAD ] REQUEST_METHOD" fi -if [ X"$DOCUMENT_ROOT" != X ]; then +if [[ -z $DOCUMENT_ROOT ]]; then echo "[ OK ] DOCUMENT_ROOT" else echo "[ BAD ] DOCUMENT_ROOT" fi # Test for existence only, since the location changes. -if [ X"$SCRIPT_FILENAME" = X ]; then +if [[ -z $SCRIPT_FILENAME ]]; then echo "[ BAD ] SCRIPT_FILENAME" else echo "[ OK ] SCRIPT_FILENAME" fi # Test for existence only, since the default value might change. -if [ X"$SERVER_PORT" = X ]; then +if [[ -z $SERVER_PORT ]]; then echo "[ BAD ] SERVER_PORT" else echo "[ OK ] SERVER_PORT" fi -if [ X"$SERVER_SOFTWARE" = X'hibachi/1.0' ]; then +if [[ -z $SERVER_SOFTWARE ]]; then SERVER_SOFTWARE=''; fi +if [[ $SERVER_SOFTWARE == 'hibachi/1.0' ]]; then echo "[ OK ] SERVER_SOFTWARE" else echo "[ BAD ] SERVER_SOFTWARE" fi -if [ X"$GATEWAY_INTERFACE" = X'CGI/0.0' ]; then +if [[ -z $GATEWAY_INTERFACE ]]; then GATEWAY_INTERFACE=''; fi +if [[ $GATEWAY_INTERFACE == 'CGI/0.0' ]]; then echo "[ OK ] GATEWAY_INTERFACE" else echo "[ BAD ] GATEWAY_INTERFACE" @@ -86,7 +89,13 @@ fi echo "" -. "$DOCUMENT_ROOT/test/shell/dump.sh" +if [[ -z $DOCUMENT_ROOT ]]; then DOCUMENT_ROOT='.'; fi +# We want to source the file, but for SC1091 the file is not available at the time of this edit. +# +# SC1091 (info): Not following: ./test/shell/dump.sh was not specified as input (see shellcheck -x). +# https://www.shellcheck.net/wiki/SC1091 +# shellcheck disable=SC1091 +source "$DOCUMENT_ROOT/test/shell/dump.sh" cat <<'-EOT-'