Change ambiguous variable and function names

Author: buchdag

app/entrypoint.sh

@@ -49,7 +49,7 @@ function get_nginx_proxy_cid {
             break
         fi
     done
-    if [[ -z "$(nginx_proxy_container)" ]]; then
+    if [[ -z "$(get_nginx_proxy_container)" ]]; then
         echo "Error: can't get nginx-proxy container id !" >&2
         echo "Check that you use the --volumes-from option to mount volumes from the nginx-proxy or label the nginx proxy container to use with 'com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true'." >&2
         exit 1
@@ -96,7 +96,7 @@ source /app/functions.sh
 
 if [[ "$*" == "/bin/bash /app/start.sh" ]]; then
     check_docker_socket
-    if [[ -z "$(docker_gen_container)" ]]; then
+    if [[ -z "$(get_docker_gen_container)" ]]; then
         [[ -z "${NGINX_PROXY_CONTAINER:-}" ]] && get_nginx_proxy_cid
     fi
     check_writable_directory '/etc/nginx/certs'

app/functions.sh

@@ -9,7 +9,7 @@
  declare -r END_HEADER='## End of configuration add by letsencrypt container'
 
 function check_nginx_proxy_container_run {
-    local _nginx_proxy_container=$(nginx_proxy_container)
+    local _nginx_proxy_container=$(get_nginx_proxy_container)
     if [[ $(docker_api "/containers/${_nginx_proxy_container}/json" | jq -r '.State.Status') = "running" ]];then
         return 0
     fi
@@ -19,7 +19,7 @@ function check_nginx_proxy_container_run {
 }
 
 function check_two_containers_case() {
-    local _docker_gen_container=$(docker_gen_container)
+    local _docker_gen_container=$(get_docker_gen_container)
     if [[ -n "${_docker_gen_container:-}" ]]; then  #case with 3 containers
         return 1
     fi
@@ -96,18 +96,18 @@ function labeled_cid {
     docker_api "/containers/json" | jq -r '.[] | select(.Labels["'$1'"])|.Id'
 }
 
-function docker_gen_container {
+function get_docker_gen_container {
     echo ${NGINX_DOCKER_GEN_CONTAINER:-$(labeled_cid com.github.jrcs.letsencrypt_nginx_proxy_companion.docker_gen)}
 }
 
-function nginx_proxy_container {
+function get_nginx_proxy_container {
     echo ${NGINX_PROXY_CONTAINER:-$(labeled_cid com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy)}
 }
 
 ## Nginx
 reload_nginx() {
-    local _docker_gen_container=$(docker_gen_container)
-    local _nginx_proxy_container=$(nginx_proxy_container)
+    local _docker_gen_container=$(get_docker_gen_container)
+    local _nginx_proxy_container=$(get_nginx_proxy_container)
 
     if [[ -n "${_docker_gen_container:-}" ]]; then
         # Using docker-gen and nginx in separate container

app/letsencrypt_service

@@ -53,7 +53,7 @@ update_certs() {
     # shellcheck source=/dev/null
     source "$DIR"/letsencrypt_service_data
 
-    reload_nginx='false'
+    should_reload_nginx='false'
     for cid in "${LETSENCRYPT_CONTAINERS[@]}"; do
         # Derive host and email variable names
         host_varname="LETSENCRYPT_${cid}_HOST"
@@ -175,12 +175,12 @@ update_certs() {
         done
 
         for domain in "${!hosts_array}"; do
-            create_links $base_domain $domain && reload_nginx='true'
-            [[ $simp_le_return -eq 0 ]] && reload_nginx='true'
+            create_links $base_domain $domain && should_reload_nginx='true'
+            [[ $simp_le_return -eq 0 ]] && should_reload_nginx='true'
         done
     done
 
-    [[ "$reload_nginx" == 'true' ]] && reload_nginx
+    [[ "$should_reload_nginx" == 'true' ]] && reload_nginx
 }
 
 # Allow the script functions to be sourced without starting the Service Loop.

app/update_certs app/signal_le_serviceapp/update_certs renamed to app/signal_le_service

@@ -16,7 +16,7 @@ trap 'term_handler' INT QUIT TERM
 /app/letsencrypt_service &
 letsencrypt_service_pid=$!
 
-docker-gen -watch -notify '/app/update_certs' -wait 15s:60s /app/letsencrypt_service_data.tmpl /app/letsencrypt_service_data &
+docker-gen -watch -notify '/app/signal_le_service' -wait 15s:60s /app/letsencrypt_service_data.tmpl /app/letsencrypt_service_data &
 docker_gen_pid=$!
 
 # wait "indefinitely"