Merge pull request #365 from continuouspipe/feature/function-set-scope-forget

kierenevans · web-flow · commit 5e7559230982 · 2017-08-18T23:31:37.000+01:00
Use subshells to avoid set calls needing to be reset
diff --git a/drupal/usr/local/share/drupal/drupal_functions.sh b/drupal/usr/local/share/drupal/drupal_functions.sh
@@ -97,14 +97,15 @@ do_drupal_install() {
   # then install it.
   if ! drush status bootstrap -r "${WEB_DIRECTORY}" | grep -q Successful ; then
     echo 'Installing Drupal'
-    set +x
-    INSTALL_OPTS="${DRUPAL_INSTALL_PROFILE} --account-name=\"${DRUPAL_ADMIN_USERNAME}\"  --account-pass=\"${DRUPAL_ADMIN_PASSWORD}\" install_configure_form.update_status_module='array(FALSE,FALSE)'"
-    # We should make sure this is writeable, but only do it directly before an
-    # install. Drupal will lock it back down on install completion.
-    chmod -R ug+rw,o-w "${WEB_DIRECTORY}/sites/default/files"
-    chmod go+w "${WEB_DIRECTORY}/sites/default/settings.php"
-    as_code_owner "drush site-install ${INSTALL_OPTS} -y -r ${WEB_DIRECTORY}"
-    set -x
+    (
+      set +x
+      INSTALL_OPTS="${DRUPAL_INSTALL_PROFILE} --account-name=\"${DRUPAL_ADMIN_USERNAME}\"  --account-pass=\"${DRUPAL_ADMIN_PASSWORD}\" install_configure_form.update_status_module='array(FALSE,FALSE)'"
+      # We should make sure this is writeable, but only do it directly before an
+      # install. Drupal will lock it back down on install completion.
+      chmod -R ug+rw,o-w "${WEB_DIRECTORY}/sites/default/files"
+      chmod go+w "${WEB_DIRECTORY}/sites/default/settings.php"
+      as_code_owner "drush site-install ${INSTALL_OPTS} -y -r ${WEB_DIRECTORY}"
+    )
   fi
 
 }
@@ -123,15 +124,13 @@ do_drupal_sync_database() {
 ####
 # Provide SSH keys so that do_drupal_sync_database_backup_via_ssh can function
 ####
-do_drupal_setup_sync_ssh_keys() {
+do_drupal_setup_sync_ssh_keys() (
   set +x
   do_user_ssh_keys "build" "${DRUPAL_SYNC_SSH_KEY_NAME}" "${DRUPAL_SYNC_SSH_PRIVATE_KEY}" "${DRUPAL_SYNC_SSH_PUBLIC_KEY}" "${DRUPAL_SYNC_SSH_KNOWN_HOSTS}"
-  set +x
   unset DRUPAL_SYNC_SSH_PRIVATE_KEY
   unset DRUPAL_SYNC_SSH_PRIVATE_KEY
   unset DRUPAL_SYNC_SSH_KNOWN_HOSTS
-  set -x
-}
+)
 
 ####
 # Ability to sync a database dump from a remote server that is accessible via SSH.
@@ -153,7 +152,7 @@ do_drupal_sync_database_backup_via_ssh() {
 # Restore a database if required.
 # Not triggered by default, please call from a function in your plan.sh to use.
 #####
-do_drupal_database_restore() {
+do_drupal_database_restore() (
   set +x
   if [ -f "$DATABASE_ARCHIVE_PATH" ]; then
     local DATABASE_ARGS=(-h"$DATABASE_HOST")
@@ -187,8 +186,7 @@ do_drupal_database_restore() {
       zcat "$DATABASE_ARCHIVE_PATH" | mysql "${DATABASE_ARGS[@]}" "$DATABASE_NAME" || return 1
     fi
   fi
-  set -x
-}
+)
 
 do_drupal_database_sanitise() {
   as_code_owner "drush ${DRUPAL_DRUSH_ALIAS} sql-sanitize --yes -r ${WEB_DIRECTORY}"
diff --git a/magento1/usr/local/share/magento1/magento_functions.sh b/magento1/usr/local/share/magento1/magento_functions.sh
@@ -45,7 +45,7 @@ function do_magento_frontend_build() {
   fi
 }
 
-function do_replace_core_config_values() {
+function do_replace_core_config_values() (
   set +x
   local SQL
   SQL="DELETE from core_config_data WHERE path LIKE 'web/%base_url';
@@ -61,8 +61,7 @@ function do_replace_core_config_values() {
   echo "$SQL"
   
   echo "$SQL" | mysql -h"$DATABASE_HOST" -u"$DATABASE_USER" -p"$DATABASE_PASSWORD" "$DATABASE_NAME"
-  set -x
-}
+)
 
 function do_magento_config_cache_enable() {
   as_code_owner "php /app/bin/n98-magerun.phar cache:enable config" "${MAGE_ROOT}"
@@ -85,7 +84,7 @@ function do_magento_cache_flush() {
   as_code_owner "php bin/n98-magerun.phar cache:flush"
 }
 
-function do_magento_create_admin_user() {
+function do_magento_create_admin_user() (
   if [ "$MAGENTO_CREATE_ADMIN_USER" != 'true' ]; then
     return 0
   fi
@@ -99,9 +98,8 @@ function do_magento_create_admin_user() {
     set +x
     echo "Creating admin user '$MAGENTO_ADMIN_USERNAME'"
     as_code_owner "php /app/bin/n98-magerun.phar admin:user:create '$MAGENTO_ADMIN_USERNAME' '$MAGENTO_ADMIN_EMAIL' '$MAGENTO_ADMIN_PASSWORD' '$MAGENTO_ADMIN_FORENAME' '$MAGENTO_ADMIN_SURNAME' Administrators" "${MAGE_ROOT}"
-    set -x
   fi
-}
+)
 
 function do_magento_templating() {
   :
diff --git a/magento2/usr/local/share/container/baseimage-30.sh b/magento2/usr/local/share/container/baseimage-30.sh
@@ -77,11 +77,11 @@ else
 fi
 
 
-do_magento() {
+do_magento() (
   set +x
   if [ "$#" -gt 0 ]; then
     as_app_user "./bin/magento $(printf "%q " "$@")"
   else
     as_app_user "./bin/magento"
   fi
-}
+)
diff --git a/magento2/usr/local/share/magento2/development/install_database.sh b/magento2/usr/local/share/magento2/development/install_database.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-do_magento_database_restore() {
+do_magento_database_restore() (
   set +x
   if [ -f "$DATABASE_ARCHIVE_PATH" ]; then
     local DATABASE_ARGS=(-h"$DATABASE_HOST")
@@ -34,7 +34,6 @@ do_magento_database_restore() {
       zcat "$DATABASE_ARCHIVE_PATH" | mysql "${DATABASE_ARGS[@]}" "$DATABASE_NAME" || exit 1
     fi
   fi
-  set -x
-}
+)
 
 do_magento_database_restore
diff --git a/magento2/usr/local/share/magento2/magento_functions.sh b/magento2/usr/local/share/magento2/magento_functions.sh
@@ -159,7 +159,7 @@ function do_magento_install_finalise_custom() {
   fi
 }
 
-function do_magento_drop_database() {
+function do_magento_drop_database() (
   set +x
 
   if [ "$FORCE_DATABASE_DROP" != 'true' ]; then
@@ -172,9 +172,9 @@ function do_magento_drop_database() {
   else
     mysql -h"$DATABASE_HOST" -uroot -e "DROP DATABASE IF EXISTS $DATABASE_NAME" || exit 1
   fi
-}
+)
 
-function check_magento_database_exists() {
+function check_magento_database_exists() (
   set +e
   local DATABASE_EXISTS
   if [ -n "$DATABASE_PASSWORD" ]; then
@@ -189,7 +189,7 @@ function check_magento_database_exists() {
   else
     echo "false";
   fi
-}
+)
 
 function do_magento_database_create() {
   echo 'Create Magento database'
@@ -200,14 +200,13 @@ function do_magento_database_create() {
   fi
 }
 
-function do_magento_database_install() {
+function do_magento_database_install() (
   set +x
   if [ -f "$DATABASE_ARCHIVE_PATH" ]; then
     do_magento_drop_database
 
     local DATABASE_EXISTS
     DATABASE_EXISTS="$(check_magento_database_exists)"
-    set -e
 
     if [ "$DATABASE_EXISTS" != "true" ]; then
       do_magento_database_create
@@ -221,16 +220,15 @@ function do_magento_database_install() {
     fi
   fi
   set -x
-}
+)
 
-function do_magento_installer_install() {
+function do_magento_installer_install() (
   set +x
   do_magento_wait_for_database
   do_magento_drop_database
 
   local DATABASE_EXISTS
   DATABASE_EXISTS="$(check_magento_database_exists)"
-  set -e
 
   if [ "$DATABASE_EXISTS" != "true" ]; then
     do_magento_database_create
@@ -253,9 +251,7 @@ function do_magento_installer_install() {
       --use-rewrites=1 \
       --session-save=db"
   fi
-
-  set -x
-}
+)
 
 function do_magento_wait_for_database() {
   if [ "$DATABASE_HOST" != 'localhost' ]; then
@@ -301,8 +297,7 @@ function do_magento_install_development_custom() {
   fi
 }
 
-function do_replace_core_config_values() {
-  set +x
+function do_replace_core_config_values() (
   local SQL
   SQL="DELETE from core_config_data WHERE path LIKE 'web/%base_url';
   DELETE from core_config_data WHERE path LIKE 'system/full_page_cache/varnish%';
@@ -321,9 +316,7 @@ function do_replace_core_config_values() {
   else
     echo "$SQL" | mysql -h"$DATABASE_HOST" -u"$DATABASE_USER" "$DATABASE_NAME"
   fi
-
-  set -x
-}
+)
 
 function do_magento_build_start_mysql() {
   apt-get update -qq -y
@@ -393,10 +386,9 @@ function do_magento_tail_logs() {
     /app/var/log/system.log
 }
 
-function do_magento_create_admin_user() {
+function do_magento_create_admin_user() (
   set +x
   if [ -z "${MAGENTO_ADMIN_USERNAME}" ] || [ -z "${MAGENTO_ADMIN_PASSWORD}" ]; then
-    set -x
     return 0
   fi
   local SQL="SELECT 1 FROM admin_user WHERE username='$MAGENTO_ADMIN_USERNAME'"
@@ -412,7 +404,6 @@ function do_magento_create_admin_user() {
   set -e
 
   if [ "$HAS_ADMIN_USER" != 0 ]; then
-    set +x
     as_code_owner "bin/magento admin:user:create \
       --admin-user='${MAGENTO_ADMIN_USERNAME}' \
       --admin-password='${MAGENTO_ADMIN_PASSWORD}' \
@@ -421,7 +412,7 @@ function do_magento_create_admin_user() {
       --admin-lastname='Admin'"
     set -x
   fi
-}
+)
 
 function do_magento2_build() {
 
diff --git a/php-apache/usr/local/share/assets/assets_functions.sh b/php-apache/usr/local/share/assets/assets_functions.sh
@@ -56,7 +56,7 @@ function assets_apply_database()
 }
 
 function assets_apply_database_mysql()
-{
+(
   set +x
   local DECOMPRESS
   local -r ASSET_FILE="$1"
@@ -87,7 +87,6 @@ function assets_apply_database_mysql()
   fi
 
   wait_for_remote_ports "${ASSETS_DATABASE_WAIT_TIMEOUT}" "${DATABASE_HOST}:${DATABASE_PORT}"
-  set +x
 
   local DATABASES
   mapfile -t DATABASES < <(mysql "${DATABASE_ARGS[@]}" --execute="SHOW DATABASES" | tail --lines=+2)
@@ -119,11 +118,10 @@ function assets_apply_database_mysql()
     echo "Importing ${ASSET_FILE} into ${APPLY_DATABASE_NAME} MySql database"
     "${DECOMPRESS[@]}" | mysql "${DATABASE_ARGS[@]}" "${APPLY_DATABASE_NAME}"
   fi
-  set -x
-}
+)
 
 function assets_apply_database_postgres()
-{
+(
   set +x
   local DECOMPRESS
   local -r ASSET_FILE="$1"
@@ -156,7 +154,6 @@ function assets_apply_database_postgres()
   fi
 
   wait_for_remote_ports "${ASSETS_DATABASE_WAIT_TIMEOUT}" "${DATABASE_HOST}:${DATABASE_PORT}"
-  set +x
 
   local DATABASES
   mapfile -t DATABASES < <(PGPASSWORD="$PGPASSWORD" psql "${DATABASE_ARGS[@]}" -lqt | cut -d \| -f 1 | sed "s/ //g")
@@ -189,8 +186,7 @@ function assets_apply_database_postgres()
     echo "Importing ${ASSET_FILE} into ${APPLY_DATABASE_NAME} MySql database"
     "${DECOMPRESS[@]}" | PGPASSWORD="$PGPASSWORD" psql "${DATABASE_ARGS[@]}" "${APPLY_DATABASE_NAME}"
   fi
-  set -x
-}
+)
 
 function do_assets_apply_database()
 {
diff --git a/php-nginx/usr/local/share/assets/assets_functions.sh b/php-nginx/usr/local/share/assets/assets_functions.sh
@@ -56,7 +56,7 @@ function assets_apply_database()
 }
 
 function assets_apply_database_mysql()
-{
+(
   set +x
   local DECOMPRESS
   local -r ASSET_FILE="$1"
@@ -87,7 +87,6 @@ function assets_apply_database_mysql()
   fi
 
   wait_for_remote_ports "${ASSETS_DATABASE_WAIT_TIMEOUT}" "${DATABASE_HOST}:${DATABASE_PORT}"
-  set +x
 
   local DATABASES
   mapfile -t DATABASES < <(mysql "${DATABASE_ARGS[@]}" --execute="SHOW DATABASES" | tail --lines=+2)
@@ -119,11 +118,10 @@ function assets_apply_database_mysql()
     echo "Importing ${ASSET_FILE} into ${APPLY_DATABASE_NAME} MySql database"
     "${DECOMPRESS[@]}" | mysql "${DATABASE_ARGS[@]}" "${APPLY_DATABASE_NAME}"
   fi
-  set -x
-}
+)
 
 function assets_apply_database_postgres()
-{
+(
   set +x
   local DECOMPRESS
   local -r ASSET_FILE="$1"
@@ -156,7 +154,6 @@ function assets_apply_database_postgres()
   fi
 
   wait_for_remote_ports "${ASSETS_DATABASE_WAIT_TIMEOUT}" "${DATABASE_HOST}:${DATABASE_PORT}"
-  set +x
 
   local DATABASES
   mapfile -t DATABASES < <(PGPASSWORD="$PGPASSWORD" psql "${DATABASE_ARGS[@]}" -lqt | cut -d \| -f 1 | sed "s/ //g")
@@ -189,8 +186,7 @@ function assets_apply_database_postgres()
     echo "Importing ${ASSET_FILE} into ${APPLY_DATABASE_NAME} MySql database"
     "${DECOMPRESS[@]}" | PGPASSWORD="$PGPASSWORD" psql "${DATABASE_ARGS[@]}" "${APPLY_DATABASE_NAME}"
   fi
-  set -x
-}
+)
 
 function do_assets_apply_database()
 {
diff --git a/spryker/usr/local/share/spryker/spryker_functions.sh b/spryker/usr/local/share/spryker/spryker_functions.sh
@@ -47,14 +47,13 @@ do_spryker_app_permissions() {
   fi
 }
 
-do_spryker_config_create() {
+do_spryker_config_create() (
   set +x
   echo "Creating Postgres Credentials file in /root/.pgpass"
   # create .pgpass in home directory for postgres client
   echo "$DATABASE_HOST:*:*:$DATABASE_USER:$DATABASE_PASSWORD" > /root/.pgpass
   chmod 0600 /root/.pgpass
-  set -x
-}
+)
 
 do_spryker_build() {
   do_spryker_directory_create
diff --git a/symfony/usr/local/share/symfony/symfony_functions.sh b/symfony/usr/local/share/symfony/symfony_functions.sh
@@ -147,11 +147,11 @@ do_symfony_build() {
   do_symfony_config_create
 }
 
-do_symfony_console() {
+do_symfony_console() (
   set +x
   if [ "$#" -gt 0 ]; then
     as_app_user "'$SYMFONY_CONSOLE' $(printf "%q " "$@")"
   else
     as_app_user "'$SYMFONY_CONSOLE'"
   fi
-}
+)
diff --git a/ubuntu/16.04/usr/local/share/bootstrap/common_functions.sh b/ubuntu/16.04/usr/local/share/bootstrap/common_functions.sh
diff --git a/ubuntu/16.04/usr/local/share/container/baseimage-10.sh b/ubuntu/16.04/usr/local/share/container/baseimage-10.sh
