anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: fix bug on init

Browse Source 
- also remove unused code and some updates
This commit is contained in:
Uwe Stöhr 2019-03-26 02:34:54 +01:00
parent 8b86f744cb
commit e5c7084a9c
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
development/Win32/packaging/installer/include/init.nsh
View File

@ -610,11 +610,6 @@ Function .onInit
Abort Abort
${endif} ${endif}
# read the user and computer name
ReadRegStr $ComputerName HKLM "System\CurrentControlSet\Control\ComputerName\ActiveComputerName" "ComputerName"
System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
StrCpy $UserName $0
!insertmacro MULTIUSER_INIT !insertmacro MULTIUSER_INIT
# check if this LyX version is already installed # check if this LyX version is already installed
@ -632,7 +627,7 @@ Function .onInit
# check if the uninstaller was acidentally deleted # check if the uninstaller was acidentally deleted
# if so don't bother the user if he realy wants to install a new LyX over an existing one # if so don't bother the user if he realy wants to install a new LyX over an existing one
# because he won't have a chance to deny this # because he won't have a chance to deny this
StrCpy $4 $0 -10 # remove '\bin\lyx,0' StrCpy $4 $0 -12 # remove '\bin\lyx.exe'
# (for FileCheck the variables $0 and $1 cannot be used) # (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from LyXUtils.nsh !insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from LyXUtils.nsh
${if} $5 == "False" ${if} $5 == "False"

2
development/Win32/packaging/installer/include/variables.nsh
View File

@ -14,7 +14,6 @@ Var APPDATemp
Var AppPre Var AppPre
var AppSubfolder var AppSubfolder
Var AppSuff Var AppSuff
Var ComputerName
Var CreateDesktopIcon Var CreateDesktopIcon
Var CreateFileAssociations Var CreateFileAssociations
Var DictCode Var DictCode
@ -49,6 +48,5 @@ Var ThesCode
Var ThesCodes Var ThesCodes
Var UpdateFNDBReturn Var UpdateFNDBReturn
Var UserList Var UserList
Var UserName
Var LangName Var LangName

6
development/Win32/packaging/installer/settings.nsh
View File

@ -18,12 +18,12 @@ These typically need to be modified for each LyX release
!define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
!define COPYRIGHT_YEAR 2018 !define COPYRIGHT_YEAR 2019
#-------------------------------- #--------------------------------
# Installer file name # Installer file name
# Typical names for the release are "LyX-211-Installer-1.exe" etc. # Typical names for the release are "LyX-232-Installer-1.exe" etc.
!ifndef ExeFile !ifndef ExeFile
!define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe" !define ExeFile "${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@ -46,4 +46,4 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/" !define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
!define ImageMagickVersion "7.0.7" !define ImageMagickVersion "7.0.8"