diff --git a/bin/publish.sh b/bin/publish.sh index 5d69c4b..71fba4c 100755 --- a/bin/publish.sh +++ b/bin/publish.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -ROOT="$(dirname $0)/.." +ROOT="$(dirname "$0")/.." SCHEME="https:" allItems="" @@ -17,33 +17,33 @@ SWAGGER_DIRECTORY=$(dirname "${SWAGGER_FILE}") NAME=$(basename "${SWAGGER_DIRECTORY}") - TITLE=$(cat "${SWAGGER_FILE}"|jq .info.title) + TITLE=$(jq .info.title < "${SWAGGER_FILE}") if [ "${TITLE:-null}" = "null" ] then logger -s "${NAME} - ERROR: swagger has no title !" return 2 fi - SUMMARY=$(cat "${SWAGGER_FILE}"|jq .info.summary) + SUMMARY=$(jq .info.summary < "${SWAGGER_FILE}") DESCRIPTION=$(jq .info.description < "${SWAGGER_FILE}") if [ "${SUMMARY:-null}" = "null" ] && [ "${DESCRIPTION:-null}" = "null" ] then logger -s "${NAME} - ERROR: swagger has no summary nor description!" return 3 fi - SERVERS=$(cat "${SWAGGER_FILE}"|jq -r ".servers") + SERVERS=$(jq -r ".servers" < "${SWAGGER_FILE}") if [ "${SERVERS:-null}" = "null" ] then logger -s "${NAME} - ERROR: swagger has no servers!" return 4 fi - URL=$(cat "${SWAGGER_FILE}"|jq -r ".servers[] | select(.\"x-profil\").url"|sed -e "s/^/ - url: /") + URL=$(jq -r ".servers[] | select(.\"x-profil\").url" < "${SWAGGER_FILE}"|sed -e "s/^/ - url: /") if [ "${URL:-null}" = "null" ] then logger -s "${NAME} - ERROR: swagger has no url !" return 5 fi # First profil will be used for all url - PROFIL=$(cat "${SWAGGER_FILE}"|jq -r ".servers[] | select(.\"x-profil\").\"x-profil\""|head -n 1) + PROFIL=$(jq -r ".servers[] | select(.\"x-profil\").\"x-profil\"" < "${SWAGGER_FILE}"|head -n 1) case ${PROFIL} in Standard | Deprecated | Reserved | Administrator ) echo -n "${NAME} - ${PROFIL} - " @@ -53,8 +53,8 @@ return 6 ;; esac - CURL_OUTFILE=$(tempfile) - cat < ${CURL_OUTFILE} + CURL_OUTFILE=$(mktemp) + cat < "${CURL_OUTFILE}" http: routers: Router-${NAME}: @@ -71,29 +71,29 @@ ${URL} EOF - HTTP_CODE=$(cat ${CURL_OUTFILE}; rm ${CURL_OUTFILE}) + HTTP_CODE=$(cat "${CURL_OUTFILE}"; rm "${CURL_OUTFILE}") echo -n "${HTTP_CODE} - " - CURL_OUTFILE=$(tempfile) - cat < ${CURL_OUTFILE} + CURL_OUTFILE=$(mktemp) + cat < "${CURL_OUTFILE}" - job_name: '${NAME}' scrape_interval: 10s scheme: https static_configs: - targets: ['${NAME}.services.istex.fr'] EOF - HTTP_CODE=$(cat ${CURL_OUTFILE}; rm ${CURL_OUTFILE}) + HTTP_CODE=$(cat "${CURL_OUTFILE}"; rm "${CURL_OUTFILE}") echo "${HTTP_CODE}" allItems+="{ url: \"${SCHEME}//${NAME}.services.istex.fr\", name: ${TITLE} }," return 0 } -FILES=$(ls ${ROOT}/*/swagger.json) +FILES=$(ls "${ROOT}"/*/swagger.json) echo -n "Login: " -read login +read -r login echo -n "Password: " -read -s passw +read -rs passw echo " " for swagger in ${FILES} @@ -103,8 +103,8 @@ echo -n "open-api - Swagger - " -CURL_OUTFILE=$(tempfile) -cat < ${CURL_OUTFILE} +CURL_OUTFILE=$(mktemp) +cat < "${CURL_OUTFILE}" window.onload = function() { // @@ -128,5 +128,5 @@ // }; EOF -HTTP_CODE=$(cat ${CURL_OUTFILE}; rm ${CURL_OUTFILE}) +HTTP_CODE=$(cat "${CURL_OUTFILE}"; rm "${CURL_OUTFILE}") echo "${HTTP_CODE}"