shell script output fixes, cleanup, typos

Author: joemaller

bin/docker-entrypoint-iop.sh

@@ -1,17 +1,22 @@
 #!/bin/bash
 
+RESET="\033[0m"
+BOLD="\033[1m"
+GOLD="\033[33m"
+
 if [[ "$1" == init ]]; then
-  /usr/local/bin/wp-init.sh
-  /usr/local/bin/permissions.sh
-  /usr/local/bin/getting-started.sh
+  OWNER_GROUP=$(stat -c "%u:%g" /usr/src/site)
+  . /usr/local/bin/wp-init.sh
+  . /usr/local/bin/permissions.sh
+  . /usr/local/bin/getting-started.sh
   exit 0
 fi
 
 # TODO: Remove once we're certain it's unused
 # This was never called. docker-compose files replace the entrypoint instead
 if [[ "$1" == permissions ]]; then
-  echo "DEPRECATED: Replace the entrypoint with /usr/local/bin/permissions"
-  echo "            or call from docker-compose."
+  echo "${GOLD}DEPRECATED: Replace the entrypoint with /usr/local/bin/permissions${RESET}"
+  echo "${GOLD}            or call from docker-compose. (docker-entrypoint.sh)${RESET}"
   /usr/local/bin/permissions.sh
   exit 0
 fi

bin/permissions.sh

@@ -24,12 +24,13 @@ if [[ -z $OWNER_GROUP ]]; then
   # be root, but on Linux it will match the active host user.
 
   echo -e "${GOLD}DEPRECATED: ${BOLD}\$OWNER_GROUP${RESET}${GOLD} should be defined in the environment, or from docker-compose.${RESET}"
-  echo -e "${GOLD}            Falling back to an internal definition. This will fail if \`/usr/src/site\` does not exist.${RESET}"
+  echo -e "${GOLD}            Falling back to internal definition. This run will fail if \`/usr/src/site\` does not exist. (permissions.sh)${RESET}"
 
   OWNER_GROUP=$(stat -c "%u:%g" /usr/src/site)
 fi
 
-echo -e "${GOLD}Resetting permissions"
+echo
+echo -e "${GOLD}${BOLD}Resetting permissions${RESET}"
 
 # This list is intentionally granular for files outside of the theme directory
 TOP_LEVEL_FILES=(
@@ -60,7 +61,7 @@ find /usr/src/boilerplate-tooling -type f -printf "%P\n" | while read f; do
   echo -ne "${DO}${GOLD} Resetting permissions: Boilerplate tooling: ${CYAN}${f}${CLEAR}\r"
   chown -f "${OWNER_GROUP}" "/usr/src/site/${f}"
   chmod -f 0664 "/usr/src/site/${f}"
-  sleep 0.8s
+  sleep 0.2s
 done
 echo -e "${DONE} Boilerplate tooling${CLEAR}"
 sleep 0.2s
@@ -89,4 +90,4 @@ find /usr/src/site/wp-content -type f -wholename '*acf-json/*.json' -exec chown
 echo -e "${DONE} acf-json Permissions & Ownership${CLEAR}"
 sleep 0.2s
 
-echo -e "${DONE}${GREEN} Done!${CLEAR}"
+echo -e "${DONE}${GREEN} Done!${RESET}"

bin/pull.sh

@@ -17,11 +17,11 @@ CYAN="\033[36m"
 FAIL="\r${RED}${BOLD}×${RESET} "
 
 if [[ -z $OWNER_GROUP ]]; then
-  # Lifted from permissions.sh, used to exsure _db, uploads and plugins have correct ownership & permissions
+  # Lifted from permissions.sh, used to ensure _db, uploads and plugins have correct ownership & permissions
   # NOTE: Definiing this variable in the script is a fallback and probably deprecated or only for testing.
-  # The value should be definied from the docker call or from the docker-compose file.
+  # The value should already be defined before this script is called. (eg. the docker call or in docker-compose)
   echo -e "${GOLD}DEPRECATED: ${BOLD}\$OWNER_GROUP${RESET}${GOLD} should be defined in the environment, or from docker-compose.${RESET}"
-  echo -e "${GOLD}            Falling back to an internal definition. This will fail if \`/usr/src/site\` does not exist.${RESET}"
+  echo -e "${GOLD}            Falling back to internal definition. This run will fail if \`/usr/src/site\` does not exist. (pull.sh)${RESET}"
 
   OWNER_GROUP=$(stat -c "%u:%g" /usr/src/site)
 fi

bin/wp-init.sh

@@ -67,7 +67,7 @@ if [[ -z "$DESCRIPTION" ]]; then
 fi
 
 echo
-echo -e "${BOLD}Setting up WordPress environment${RESET}"
+echo -e "${GOLD}${BOLD}Setting up WordPress environment${RESET}"
 echo -e "Theme name: ${CYAN}${NAME}${RESET}"
 if [[ -n "$DESCRIPTION" ]]; then
   echo -e "Description: ${CYAN}${DESCRIPTION}${RESET}"
@@ -151,7 +151,7 @@ echo -e "$DONE"
 # install everything from package.json but won't rewrite package-lock.json
 if [[ ! -s /usr/src/site/package-lock.json ]]; then
   echo -ne "${DO}Creating placeholder ${CYAN}package-lock.json${RESET} file"
-  echo '{"lockfileVersion":2}' > /usr/src/site/package-lock.json
+  echo '{"lockfileVersion":2}' >/usr/src/site/package-lock.json
   sleep 0.2s
   echo -e "$DONE"
 fi