[geany/geany-plugins] 739a80: Merge pull request #1324 from eht16/issue1321_fix_windows_user_installation - Plugins-Commits

23 Jun 2024


      Branch:      refs/heads/master
Author:      Enrico Tröger enrico.troeger@uvena.de
Committer:   GitHub noreply@github.com
Date:        Sun, 23 Jun 2024 21:06:14 UTC
Commit:      739a801144426662759d956496fd6ba39b2b43f8
             https://github.com/geany/geany-plugins/commit/739a801144426662759d956496fd6b...
Log Message:
-----------
Merge pull request #1324 from eht16/issue1321_fix_windows_user_installation
Windows installer: Prefer Geany installation directory over user's HOME
Modified Paths:
--------------
    build/geany-plugins.nsi
Modified: build/geany-plugins.nsi
25 lines changed, 14 insertions(+), 11 deletions(-)
===================================================================
@@ -73,7 +73,7 @@ ManifestSupportedOS all
OutFile "${GEANY_PLUGINS_INSTALLER_NAME}"
-Var Answer
+Var UserIsAdmin
 Var UserName
 Var GEANY_INSTDIR
 Var UNINSTDIR
@@ -156,7 +156,7 @@ Section -Post
WriteUninstaller "$INSTDIR\uninst-plugins.exe"
    WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" Path "$INSTDIR"
-	${if} $Answer == "yes" ; if user is admin
+	${if} $UserIsAdmin == "yes"
    	WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
    	WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst-plugins.exe"
    	WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\Geany.exe"
@@ -378,16 +378,13 @@ FunctionEnd
 Function .onInit
    ; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/nsi...)
    ; If the user does *not* have administrator privileges, abort
-	StrCpy $Answer ""
+	StrCpy $UserIsAdmin ""
    StrCpy $UserName ""
-	!insertmacro IsUserAdmin $Answer $UserName ; macro from LyXUtils.nsh
-	${if} $Answer == "yes"
+	!insertmacro IsUserAdmin $UserIsAdmin $UserName ; macro from LyXUtils.nsh
+	${if} $UserIsAdmin == "yes"
    	SetShellVarContext all ; set that e.g. shortcuts will be created for all users
    ${else}
    	SetShellVarContext current
-		; TODO is this really what we want? $PROGRAMFILES is not much better because
-		; probably the unprivileged user can't write it anyways
-		StrCpy $INSTDIR "$PROFILE$(^Name)"
    ${endif}
; prevent running multiple instances of the installer
@@ -403,6 +400,12 @@ Function .onInit
    	StrCpy $INSTDIR "$GEANY_INSTDIR"
    ${EndIf}
+	; if $INSTDIR has not been set yet above, set it to the profile directory for non-admin users
+	${If} $INSTDIR == ""
+	${AndIf} $UserIsAdmin != "yes"
+		StrCpy $INSTDIR "$PROFILE$(^Name)"
+	${EndIf}
+
    ; warn about a new install over an existing installation
    ReadRegStr $R0 SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString"
    StrCmp $R0 "" finish
@@ -433,9 +436,9 @@ FunctionEnd
Function un.onInit
    ; If the user does *not* have administrator privileges, abort
-	StrCpy $Answer ""
-	!insertmacro IsUserAdmin $Answer $UserName
-	${if} $Answer == "yes"
+	StrCpy $UserIsAdmin ""
+	!insertmacro IsUserAdmin $UserIsAdmin $UserName
+	${if} $UserIsAdmin == "yes"
    	SetShellVarContext all
    ${else}
    	; check if the Geany has been installed with admin permisions
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    