gnucash-on-windows master: Use the final file name from bundle-mingw64.ps1 for the upload file operation.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/8df2983a (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/dade554a (commit)



commit 8df2983a0ffa20381ae09226a1484f67e964d7d6
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 11 16:24:29 2017 -0700

    Use the final file name from bundle-mingw64.ps1 for the upload file operation.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f3f5522..8093a86 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -108,8 +108,12 @@ if ($new_file) {
 #Build the installer
     $is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
     bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
-    & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+    $setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+    $setup_file = make-unixpath -path $setup_file
 }
+
+write-host "Created GnuCash Setup File $setup_file"
+
 $time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
 bash-command -command "echo Build Ended $time_stamp >> $log_unix"
 
@@ -117,6 +121,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
 if ($hostname) {
 	bash-command -command "scp -p $log_unix $hostname/$log_dir/"
     if ($new_file) {
-	bash-command -command "scp -p $target_unix/gnucash*setup.exe $hostname/master"
+	bash-command -command "scp -p $setup_file $hostname/master"
     }
 }
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index b4d77e1..27f280b 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -142,3 +142,4 @@ if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
     remove-item $final_file
 }
 rename-item -path $setup_result $final_file
+return $final_file
\ No newline at end of file



Summary of changes:
 buildserver/build_package.ps1 | 8 ++++++--
 bundle-mingw64.ps1            | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)