Skip to content

864-Windows-installer-issue-fix #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ann0see merged 1 commit into from
Mar 21, 2021
Merged

864-Windows-installer-issue-fix #1319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions windows/installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ Var bRunApp
!define prefix "${DEPLOY_PATH}\${buildArch}"
!tempfile files

; Find target folders (Probably here's an issue with quoting. If ${prefix} contains spaces, the installer folders aren't created in the right way.)
!system 'cmd.exe /v /c "for /f "usebackq" %d in (`dir /b /s /ad "${prefix}"`) do \
; Find target folders (#864 resolved by adding delims= to the for command. This prevents splitting path names when the path contains spaces)
!system 'cmd.exe /v /c "for /f "usebackq delims=" %d in (`dir /b /s /ad "${prefix}"`) do \
@(set "_d=%d" && echo CreateDirectory "$INSTDIR\!_d:${prefix}\=!" >> "${files}")"'

; Find target files
Expand Down Expand Up @@ -415,8 +415,8 @@ FunctionEnd
!system 'cmd.exe /v /c "for /r "${prefix}" %f in (*.*) do \
@(set "_f=%f" && echo Delete "$INSTDIR\!_f:${prefix}\=!" >> "${files}")"'

; Find target folders in reverse order to ensure they can be deleted when empty
!system 'cmd.exe /v /c "for /f "usebackq" %d in \
; Find target folders in reverse order to ensure they can be deleted when empty (include delims= to prevent splitting path names when the path contains spaces)
!system 'cmd.exe /v /c "for /f "usebackq delims=" %d in \
(`dir /b /s /ad "${prefix}" ^| C:\Windows\System32\sort.exe /r`) do \
@(set "_d=%d" && echo RMDir "$INSTDIR\!_d:${prefix}\=!" >> "${files}")"'

Expand Down