Codacy compliant

This commit is contained in:
Samuel Huang
2024-09-30 21:52:10 +10:00
parent 0c3aa7b69e
commit 1c27e9d340
18 changed files with 36 additions and 67 deletions

5
run.sh
View File

@@ -1,7 +1,6 @@
#!/bin/bash
DIR=$(dirname $0)
DIR="$(cd $DIR; pwd)"
CERTHOME="/opt/cert"
XCONF=/tmp/server-xray.json
@@ -36,7 +35,7 @@ usage() {
echo " -r|--request-domain <domain-name> Domain name to request for letsencrypt cert"
echo " -c|--cert-home <cert-home-dir> Reading TLS certs from folder <cert-home-dir>/<domain-name>/"
echo " -i|--stdin Read config from STDIN instead of auto generation"
echo " -j|--json Json snippet to merge into the config. Say '{"log":{"loglevel":"info"}}'"
echo " -j|--json Json snippet to merge into the config. Say '{\"log\":{\"loglevel\":\"info\"}}'"
echo " -d|--debug Start in debug mode with verbose output"
}
@@ -232,7 +231,7 @@ done
if [ -n "${DEBUG}" ]; then loglevel="debug"; else loglevel="warning"; fi
Jroot=$(echo $Jroot| jq --arg loglevel "${loglevel}" '.log.loglevel |= $loglevel')
if [ -n "${INJECT}" ]; then
if [ -n "${INJECT[@]}" ]; then
for JSON_IN in "${INJECT[@]}"
do
Jmerge=$(jq -nc "${JSON_IN}")