From 3882b1c6973ac2d42f74f99ccfe2eb9a132665e5 Mon Sep 17 00:00:00 2001
From: Urs Roesch <github@bun.ch>
Date: Tue, 30 Jun 2020 22:33:36 +0000
Subject: [PATCH] PA-Upgrade: Bugfix Windows install path

---
 .gitignore                  |  1 +
 App/AppInfo/appinfo.ini     |  4 ++--
 App/AppInfo/update.ini      |  4 ++--
 Other/Update/PA-Upgrade.ps1 | 15 ++++++---------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index d455d7d..31648f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.exe
 Data
+App/AppInfo/pac_installer_log.ini
 App/DBeaver
 Download
diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini
index b30234b..bbb1883 100644
--- a/App/AppInfo/appinfo.ini
+++ b/App/AppInfo/appinfo.ini
@@ -19,8 +19,8 @@ Freeware=true
 CommercialUse=true
 
 [Version]
-PackageVersion=7.1.1.1
-DisplayVersion=7.1.1-beta5-uroesch
+PackageVersion=7.1.1.3
+DisplayVersion=7.1.1-beta7-uroesch
 
 [Dependencies]
 UsesJava=true
diff --git a/App/AppInfo/update.ini b/App/AppInfo/update.ini
index 968173c..0b2b4cb 100644
--- a/App/AppInfo/update.ini
+++ b/App/AppInfo/update.ini
@@ -1,6 +1,6 @@
 [Version]
-Package = 7.1.1.2
-Display = 7.1.1-beta6-uroesch
+Package = 7.1.1.3
+Display = 7.1.1-beta7-uroesch
 
 [Archive]
 URL1         = https://dbeaver.io/files/7.1.1/dbeaver-ce-7.1.1-win32.win32.x86_64.zip
diff --git a/Other/Update/PA-Upgrade.ps1 b/Other/Update/PA-Upgrade.ps1
index 3c54732..61cfa08 100644
--- a/Other/Update/PA-Upgrade.ps1
+++ b/Other/Update/PA-Upgrade.ps1
@@ -11,7 +11,7 @@ Using module ".\PortableAppsCommon.psm1"
 # -----------------------------------------------------------------------------
 # Globals
 # -----------------------------------------------------------------------------
-$Version    = "0.0.2-alpha"
+$Version    = "0.0.3-alpha"
 $Debug      = $True
 $SiteUrl    = "https://github.com"
 $ReleaseUrl = "$SiteUrl/uroesch/$AppName/releases/"
@@ -79,24 +79,21 @@ Function Invoke-Installer() {
   param(
     [string] $Command
   )
+  Set-Location "$AppRoot\.."
+  $PARoot    = (Get-Location)
+  $Arguments = "/AUTOCLOSE=true " +
+               "/DESTINATION=""$(ConvertTo-WindowsPath $PARoot)\\"""
   #  Addtional Switches for paf.exe
   #  /HIDEINSTALLER=true
   #  /SILENT=true
 
   Switch (Test-Unix) {
     $True   {
-      Set-Location "$AppRoot\.."
-      $PARoot    = (Get-Location)
-      $Arguments = "/SILENT=true /AUTOCLOSE=true /DESTINATION=""$(ConvertTo-WindowsPath $PARoot)\\"""
       $Arguments = "$Command $Arguments"
       $Command   = "wine"
       break
     }
-    default {
-      Set-Location "$AppRoot"
-      $AppRoot    = (Get-Location)
-      $Arguments = "/AUTOCLOSE=true /DESTINATION=""$(ConvertTo-WindowsPath $AppRoot)"""
-    }
+    default { }
   }
 
   Debug info "Run PA $Command $Arguments"