diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eadfba..52c4e5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2019-01-09 Relase 1.4.2 +### Summary +Auto deploy folder bug fix + +### Changes + - Fix pathing issue when using auto deploy folders + ## 2018-09-24 Relase 1.4.1 ### Summary Encryption, Remote Deploy, code cleanup diff --git a/config.sh b/config.sh index 272b0d2..3c23bfd 100644 --- a/config.sh +++ b/config.sh @@ -53,6 +53,7 @@ module_list= #this variable will force the client to use encryption or fail force_encryption='false' + #user to make sure the script is being run as run_as='postgres' diff --git a/dbdeployer_release b/dbdeployer_release index 156e86d..162590e 100644 --- a/dbdeployer_release +++ b/dbdeployer_release @@ -1 +1 @@ -version=1.4.1 +version=1.4.2 diff --git a/plugins/git/deployment_report.sh b/plugins/git/deployment_report.sh index c10f6c3..3fc887b 100644 --- a/plugins/git/deployment_report.sh +++ b/plugins/git/deployment_report.sh @@ -74,17 +74,25 @@ deployment_report() { if [ "`git rev-parse --abbrev-ref --symbolic-full-name @{u}`" = "${branch_to_compare}" ] then FS_LIST=`eval "ls -o1 "${deploy_folder}"/*.sql | awk {'print ${deployment_report_argnum}'} | sort -rn | xargs"` + + for j in ${FS_LIST} + do + # echo "file: $j" + FS_CHECKSUM=`md5sum "${j}" | awk {'print $1'}` + # echo "FS_CHECKSUM: $FS_CHECKSUM" + FS=`echo -e "${FS}\n$j--dbdeployer-md5sum--$FS_CHECKSUM"` + done else FS_LIST=`eval "git diff --name-only ${branch_to_compare} | grep \"^${dbname}/${i}/\" | grep '.sql' | xargs"` + for j in ${FS_LIST} + do + # echo "file: $j" + FS_CHECKSUM=`md5sum "${j}" | awk {'print $1'}` + # echo "FS_CHECKSUM: $FS_CHECKSUM" + FS=`echo -e "${FS}\n${db_basedir}/$j--dbdeployer-md5sum--$FS_CHECKSUM"` + done fi - for j in ${FS_LIST} - do - # echo "file: $j" - FS_CHECKSUM=`md5sum "${j}" | awk {'print $1'}` - # echo "FS_CHECKSUM: $FS_CHECKSUM" - FS=`echo -e "${FS}\n$j--dbdeployer-md5sum--$FS_CHECKSUM"` - done else FS=''