Skip to content

Commit 24d86dd

Browse files
committed
Use double quotes instead of single quotes for passing commands to powershell/cmd.exe
As recommended by FreeRDP documentation
1 parent 89ee497 commit 24d86dd

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

linoffice.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ function waRunCommand() {
846846
-wallpaper \
847847
$RDP_KBD \
848848
$RDP_FLAGS \
849-
/app:program:powershell.exe,cmd:'-ExecutionPolicy Bypass -File C:\\OEM\\UpdateWindows.ps1' \
849+
/app:program:powershell.exe,cmd:"-ExecutionPolicy Bypass -File C:\\OEM\\UpdateWindows.ps1" \
850850
/v:"$RDP_IP:$RDP_PORT" &>/dev/null &
851851

852852
# Capture the process ID.
@@ -866,7 +866,7 @@ function waRunCommand() {
866866
-wallpaper \
867867
$RDP_KBD \
868868
$RDP_FLAGS \
869-
/app:program:powershell.exe,cmd:'-ExecutionPolicy Bypass -File C:\\OEM\\RegistryOverride.ps1' \
869+
/app:program:powershell.exe,cmd:"-ExecutionPolicy Bypass -File C:\\OEM\\RegistryOverride.ps1" \
870870
/v:"$RDP_IP:$RDP_PORT" &>/dev/null &
871871

872872
# Capture the process ID.
@@ -886,7 +886,7 @@ function waRunCommand() {
886886
-wallpaper \
887887
$RDP_KBD \
888888
$RDP_FLAGS \
889-
/app:program:cmd.exe,cmd:'/c C:\\OEM\\dns_off.bat' \
889+
/app:program:cmd.exe,cmd:"/c C:\\OEM\\dns_off.bat" \
890890
/v:"$RDP_IP:$RDP_PORT" &>/dev/null &
891891

892892
# Capture the process ID.
@@ -906,7 +906,7 @@ function waRunCommand() {
906906
-wallpaper \
907907
$RDP_KBD \
908908
$RDP_FLAGS \
909-
/app:program:cmd.exe,cmd:'/c C:\\OEM\\dns_on.bat' \
909+
/app:program:cmd.exe,cmd:"/c C:\\OEM\\dns_on.bat" \
910910
/v:"$RDP_IP:$RDP_PORT" &>/dev/null &
911911

912912
# Capture the process ID.

setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ function check_available() {
11041104
/v:127.0.0.1
11051105
/port:3388
11061106
"${arg_flags[@]}"
1107-
/app:program:cmd.exe,cmd:'/c tsdiscon'
1107+
/app:program:cmd.exe,cmd:"/c tsdiscon"
11081108
)
11091109

11101110
# Execute command based on type
@@ -1337,7 +1337,7 @@ function check_success() {
13371337
if [ "$FREERDP_NETWORK_LAN" = true ]; then
13381338
cmd_args+=("/network:lan")
13391339
fi
1340-
cmd_args+=(/app:program:powershell.exe,cmd:'-ExecutionPolicy Bypass -File C:\\OEM\\FirstRDPRun.ps1')
1340+
cmd_args+=(/app:program:powershell.exe,cmd:"-ExecutionPolicy Bypass -File C:\\OEM\\FirstRDPRun.ps1")
13411341

13421342
# Retry loop for FreeRDP connection
13431343
while [ $retry_count -lt $max_retries ]; do
@@ -1560,7 +1560,7 @@ try_install_office() {
15601560
/v:127.0.0.1
15611561
/port:3388
15621562
/timeout:$connection_timeout
1563-
/app:program:powershell.exe,cmd:'-ExecutionPolicy Bypass -File C:\\OEM\\InstallOffice.ps1'
1563+
/app:program:powershell.exe,cmd:"-ExecutionPolicy Bypass -File C:\\OEM\\InstallOffice.ps1"
15641564
)
15651565

15661566
# Add flags from successful connection test

updater.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Configuration
1313
REPO_OWNER = "eylenburg"
1414
REPO_NAME = "linoffice"
15-
CURRENT_VERSION = "2.2.1"
15+
CURRENT_VERSION = "2.2.2"
1616
GITHUB_API_URL = f"https://api.github.com/repos/{REPO_OWNER}/{REPO_NAME}/releases"
1717
PRESERVE_FILES = {"config/compose.yaml", "config/linoffice.conf", "config/oem/registry/regional_settings.reg"}
1818
GITHUB_TOKEN = None # Can replace with GitHub Personal Access Token if hitting API limits

0 commit comments

Comments
 (0)