gnucash-on-windows master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/c7b444b3 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/d06452c6 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/05cc9a91 (commit)



commit c7b444b3797f1e426e989c5f7db5e4af76fe9cdc
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 25 21:55:55 2019 +0200

    Rsync inside bash requires a unix like path
    
    This got lost in a recent refactoring commit

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 6b8b1b7..9d41ba4 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -165,6 +165,7 @@ Write-Output "Build Ended $time_stamp" | Tee-Object -FilePath $log_file -Append
 if ($hostname) {
     bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch 2>&1"
     if ($setup_file_valid) {
+        $setup_file = make-unixpath -path $setup_file
         bash.exe -lc "rsync.exe -e ssh -a $setup_file $hostname/$branch 2>&1"
     }
 }

commit d06452c6d663302b6262c1e7fed4f3f342c70773
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 25 21:55:07 2019 +0200

    Force move of installer package if one with same name already exists
    
    This is the easiest. A possibly more refined edition could
    add a number to the end to allow more than one build from the same
    gnucash-git source. This could be to compare changes in dependencies
    or in the build system.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f5630d8..6b8b1b7 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -146,7 +146,7 @@ if ($new_file) {
     if ($setup_file_valid) {
         $destination_dir="$target_dir\win32\$branch"
         New-Item -ItemType Directory -Force -Path "$destination_dir" | Out-Null
-        Move-Item -Path "$setup_file" -Destination "$destination_dir"
+        Move-Item -Path "$setup_file" -Destination "$destination_dir" -Force
         $pkg_name = Split-Path -Path "$setup_file" -Leaf
         $setup_file = "$destination_dir\$pkg_name"
         Write-Output "Created GnuCash Setup File $setup_file" | Tee-Object -FilePath $log_file -Append



Summary of changes:
 buildserver/build_package.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)