Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
jwrober authored and lmoureaux committed Jul 22, 2021
1 parent 1847d7b commit bb147cb
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions cmake/NSIS.template.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

;#########################################################
; Freeciv21 Windows installer script
; some parts adapted from classic Freeciv and Wesnoth
; some parts adapted from classic Freeciv and Wesnoth
; installer scripts.
;#########################################################

Expand All @@ -31,7 +31,7 @@
!define MUI_UI_COMPONENTSPAGE_SMALLDESC
!define MUI_LICENSEPAGE_CHECKBOX
!define MUI_LICENSEPAGE_CHECKBOX_TEXT "I agree to the license terms."

;Multi-User Variables
!define MULTIUSER_EXECUTIONLEVEL Highest
!define MULTIUSER_MUI
Expand All @@ -56,7 +56,7 @@
;#########################################################

Name "${APPNAME} v${VERSION}"
OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
ShowInstDetails show
ShowUninstDetails show
SetOverwrite on
Expand Down Expand Up @@ -84,7 +84,7 @@
; However, we choose to manually define so that we can control
; the order of the list of components to install.
; By default, tools is put on top, which we don't want.

Section "Freeciv21" freeciv21
SectionIn RO 1 2
SetOutPath $INSTDIR
Expand Down Expand Up @@ -165,7 +165,7 @@
MessageBox MB_IconInformation "Administrator rights not detected, installing in User's Home Directory by default."
${EndIf}
!macroend

;#########################################################
; Funtions
;#########################################################
Expand Down Expand Up @@ -196,22 +196,22 @@
Section "-Core installation"

SetOutPath "$INSTDIR"

; Store installation folder.
WriteRegStr "SHCTX" "SOFTWARE\${APPNAME}\${VERSION}\${CPU_ARCH}" "" "$INSTDIR"

; Create uninstaller.
WriteUninstaller "$INSTDIR\Uninstall.exe"


; Create Desktop Icon
CreateShortCut "$DESKTOP\${APPNAME} Client.lnk" "$INSTDIR\freeciv21-client.exe" "" "$INSTDIR\client.ico" 0

; Create Start Menu Entries
CreateDirectory "$SMPROGRAMS\${APPNAME} v${VERSION}"
CreateShortCut "$SMPROGRAMS\${APPNAME} v${VERSION}\${APPNAME} Client.lnk" "$INSTDIR\freeciv21-client.exe" "" "$INSTDIR\client.ico" 0
CreateShortCut "$SMPROGRAMS\${APPNAME} v${VERSION}\${APPNAME} Modpack Installer.lnk" "$INSTDIR\freeciv21-modpack-qt.exe" "" "$INSTDIR\mp.ico" 0

; Create entry in Windows "Add/Remove programs" panel.
Push "DisplayName"
Push "${APPNAME} v${VERSION}"
Expand Down Expand Up @@ -258,18 +258,18 @@

; Remove uninstaller.
Delete "$INSTDIR\Uninstall.exe"

; Remove shortcuts
Delete "$DESKTOP\${APPNAME} Client.lnk"
Delete "$SMPROGRAMS\${APPNAME} v${VERSION}\*.*"
RMDir "$SMPROGRAMS\${APPNAME} v${VERSION}"

; Remove rest of installed files.
; Custom files are left intact.
RMDir "$INSTDIR"

; Remove entry from Windows "Add/Remove programs" panel.
DeleteRegKey "SHCTX" "${REGPATH_UNINSTSUBKEY}"
DeleteRegKey "SHCTX" "${REGPATH_UNINSTSUBKEY}"
DeleteRegKey "SHCTX" "Software\${APPID}"

SectionEnd
Expand Down

0 comments on commit bb147cb

Please sign in to comment.