diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini index 4ac3089..703c081 100644 Binary files a/App/AppInfo/appinfo.ini and b/App/AppInfo/appinfo.ini differ diff --git a/App/AppInfo/update.ini b/App/AppInfo/update.ini index 52284e8..fdedf81 100644 --- a/App/AppInfo/update.ini +++ b/App/AppInfo/update.ini @@ -1,6 +1,6 @@ [Version] Package = 1.8.3.0 -Display = 1.8.3-beta1-uroesch +Display = 1.8.3-beta2-uroesch [Archive] URL1 = https://netcologne.dl.sourceforge.net/project/ldapadmin/ldapadmin/1.8.3/LdapAdminExe-w64-1.8.3.zip diff --git a/Other/Update/Update.ps1 b/Other/Update/Update.ps1 index 40c08fb..ab8ad38 100644 --- a/Other/Update/Update.ps1 +++ b/Other/Update/Update.ps1 @@ -15,12 +15,17 @@ $Debug = $True # ----------------------------------------------------------------------------- # Functions # ----------------------------------------------------------------------------- -Function Debug () { +Function Debug() { param( [string] $Message ) If (-Not($Debug)) { return } Write-Host $Message } +# ----------------------------------------------------------------------------- +Function Is-Unix() { + ($PSScriptRoot)[0] -eq '/' +} + # ----------------------------------------------------------------------------- Function Parse-Ini { param ( @@ -185,15 +190,15 @@ Function Create-Launcher() { Set-Location $AppRoot $AppPath = (Get-Location) $Launcher = "..\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe" - If ($AppPath[0] -eq '/') { - Debug "Running Launcher: wine $Launcher $(Windows-Path AppPath)" - Invoke-Expression "wine $Launcher /s $(Windows-Path $AppPath)" + If (Is-Unix) { + Debug "Running Launcher: wine $Launcher $(Windows-Path $AppPath)" + Invoke-Expression "wine $Launcher $(Windows-Path $AppPath)" } Else { - Debug "Running Launcher: wine $Launcher AppPath" + Debug "Running Launcher: $Launcher AppPath" Invoke-Expression "$Launcher $AppPath" + Write-FileSystemCache $AppPath.Drive.Name } - Write-FileSystemCache $AppPath.Drive.Name } # ----------------------------------------------------------------------------- @@ -201,8 +206,8 @@ Function Create-Installer() { Set-Location $AppRoot $AppPath = (Get-Location) $Installer = "..\PortableApps.comInstaller\PortableApps.comInstaller.exe" - If ($AppPath[0] -eq '/') { - Debug "Running Installer: wine $Installer $(Windows-Path AppPath)" + If (Is-Unix) { + Debug "Running Installer: wine $Installer $(Windows-Path $AppPath)" Invoke-Expression "wine $Installer $(Windows-Path $AppPath)" } Else {