Merge pull request #62 from covermymeds/fix-run-as-cli

run_as_user_flag was never defined, should be the new run_as_cli
covermymeds · Feb 14, 2019 · bb7a4bd · bb7a4bd
2 parents a96fbe4 + 206e056
commit bb7a4bd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
-## 2019-02-13 Release 1.5.6
+## 2019-02-14 Release 1.5.5
 ### Summary
-Add cli override for parameters
+Add cli override for parameters,fix run as implementation
 
 ### Changes
   - add override for the --allow-drop-databases command option
+  - fix run as implementation to pass through to forked processes
 
 ## 2019-02-12 Release 1.5.4
 ### Summary

diff --git a/dbdeployer b/dbdeployer
@@ -76,6 +76,7 @@ do
     -A|--run-as)
       shift
       run_as=${1}
+      run_as_cli="-A ${1}"
       shift
       ;;
     --allow-drop-database)

diff --git a/functions/deployment_report.sh b/functions/deployment_report.sh
@@ -20,7 +20,7 @@ deployment_report() {
     do
       if ! [ -z "${x}" ]
       then
-        echo "${script_name} -f "${x}" -n "${db_destination_name}" ${run_as_user_flag} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
+        echo "${script_name} -f "${x}" -n "${db_destination_name}" ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
       fi
     done
   done
@@ -68,7 +68,7 @@ deployment_report() {
             if ! [ -z "${x}" ]
             then
               auto_deploy_file=`echo ${x} | awk -F '--dbdeployer-md5sum--' {'print $1'}`
-              echo "${script_name} -f "${auto_deploy_file}" -c -n "${db_destination_name}" ${run_as_user_flag} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
+              echo "${script_name} -f "${auto_deploy_file}" -c -n "${db_destination_name}" ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
             fi
           done
         fi #end directory exists check

diff --git a/functions/update_db_to_current.sh b/functions/update_db_to_current.sh
@@ -4,9 +4,9 @@ function update_db_to_current() {
   _dbname="$1"
   _db_destination_name="$2"
 
-  #echo "report_var executes: ${script_name} -D ${db_basedir} -r -d \"${_dbname}\" -n \"${_db_destination_name}\" ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} | grep \"${script_name} -f\""
+  #echo "report_var executes: ${script_name} ${run_as_cli} -D ${db_basedir} -r -d \"${_dbname}\" -n \"${_db_destination_name}\" ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} | grep \"${script_name} -f\""
 
-  report_var=`${script_name} -D ${db_basedir} -r -d "${_dbname}" -n "${_db_destination_name}" ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} | grep "${script_name} -f"`
+  report_var=`${script_name} ${run_as_cli} -D ${db_basedir} -r -d "${_dbname}" -n "${_db_destination_name}" ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} | grep "${script_name} -f"`
   local IFS=$'\n'
   for j in `echo -e "${report_var}"`
   do

diff --git a/plugins/git/deployment_report.sh b/plugins/git/deployment_report.sh
@@ -48,7 +48,7 @@ deployment_report() {
     do
       if ! [ -z "${x}" ]
       then
-        echo "${script_name} -f "${x}" -n "${db_destination_name}" ${run_as_user_flag} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
+        echo "${script_name} -f "${x}" -n "${db_destination_name}" ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
       fi
     done
   done
@@ -111,7 +111,7 @@ deployment_report() {
             if ! [ -z "${x}" ]
             then
               auto_deploy_file=`echo ${x} | awk -F '--dbdeployer-md5sum--' {'print $1'}`
-              echo "${script_name} -f "${auto_deploy_file}" -c -n "${db_destination_name}" ${run_as_user_flag} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
+              echo "${script_name} -f "${auto_deploy_file}" -c -n "${db_destination_name}" ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}"
             fi
           done
         fi #end directory exists check