From 217760f751f7f0dbc7ec9cca966a43d07698c72d Mon Sep 17 00:00:00 2001
From: Urs Roesch <github@bun.ch>
Date: Fri, 13 Mar 2020 19:05:33 +0100
Subject: [PATCH] Beta2: Fix Unix support in the update script
Summary:
* Correct some of the issues found on Wine.
---
App/AppInfo/appinfo.ini | Bin 1624 -> 762 bytes
App/AppInfo/update.ini | 2 +-
Other/Update/Update.ps1 | 21 +++++++++++++--------
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini
index 4ac3089cc062276963562c30e0d82c362478cfd9..703c08165654fc5788650b8ec688bfa254b17adb 100644
GIT binary patch
literal 762
zcmZuv!EW0y488L!`~z{;6$6F=Is|dEWizq>Np>lGU}Pc|DvJgs*UjILPU3CBda<ZS
zKJxKd&nuP|Qw95TM`p{C@aSpLbuqWxUX$>PBsvb}G5-YcTu?&iV+9**$&@vAi@J3o
zo5-N-b@4ax2jBKb?_xt@_O9X9N%jN9^Q*J)ja%yQM5alp`!b&o!;pLJjAQ4V<ur$a
z112)C)bEMqY!1nJmmEbXC|Yq{8a0;1Vw=@Y$R;hyj>1DE$uQIz)lM-eF`W8w)>Al*
zdSEYDQ;YHv4Xi^<=>5eF-L-U<LZk|I4GN9cn7#A_KRXIL?#15jD<K-R;+kD@+mcv^
z{t(Hm&_{x&L%EoIyqKsRY6@2MSD<C_Yr`>J_b?m2K;Q8dr?}v>q4ZCOC5I&JD_C0&
z(LBH|p``z9&*_bH;37s=MWaVLaOFIWJL<+$IEq%6N*C1Rcfc9FCG}$T7`DQREqkR;
z;T`=QaMs;826npno~QGUxNFFJ&5Xw_VO0Di=dx<0z|DsWwrF4UUrxR}<e&4$`~ws&
Ub{@}n@a(7$_v5S=*5}f|ZyfazhX4Qo
literal 1624
zcma)+-EP`I5QXQuQs2QZ0BKZJsw(*ch0xNX6p17^C>In~#3~qMJ4t!@w%?hx0|qsX
zEQ5FF%$YMkyMKO9ZD1QKY;7~E?9SfW8@slhZ7o=8W4Be<e%Okg9{XD>t!r~E>z1!P
zZ^0DUGpsrO??HZWPFbhc$1b)Ewz7_P#d_`0Mz-L4OOypW84SsZ0`Wu@L)cO~^*Poo
zkFh;?1{qQBU1Lg?8Q;nxLvv!^h+Uv-V~_02UG*2Y2Q<xW=^F3RU$OpVXFN~-bn%MH
zXV1#Jcoz7aIZvNe4oBr2Qgl(TmX6zz$qiQ3CG-D)QsGpw5;X<;Terl@j<EE|D<Puv
z2QXF5m5^(}_Y<D#M?$O|T*6A|h!gwBElaA?<aY^j=_*tyVXk3NUV%!fLO)?m-7*AQ
z!ZriHI+z-H>7Bx_N(RS;y5AFc#S{3AQ>9)MXbA50ojm0+A%h3@<=;jO+&hq8<Y`+k
z@LTgJ^EvUQ?#3&TGOt>xD$;k!{)j3bPwig6svp%T|J?c1k9bZZYiXZ-j#P=mPNjB*
z5^*)SuS9?3J+){)D)2fT|5l^SauDk6s@5<>lXlgUbB{Iwp}JJ;{Qq=xiTR6npK}kc
z63$pV&1B?{IS*LtCTQ-6W)_b3n=Zu3(;Vb@#kqMMw&TilVw7ETqe$o2E1)S>?&@dc
zJ>Gvw!|Sjey02>QW5q}lSGAxDn>zO4&P#DM{Q=FZXTN6M_KI<ot#0Uc&G$XOJLp?`
zZlYz(B+NOn@pQKlnwPG9<kc<x&YAi|D#>|;$L?ej_xKJcH{Rsu*6~xiVXf(pcgA0z
C&lUgx
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 {