Skip to content

Commit

Permalink
innosetup: Fix user install
Browse files Browse the repository at this point in the history
- Use {autopf} instead of {commonpf} to install to the right user
  directory.
- Use HKA instead of HKCR.

Fixes #472

Reference-to: https://codeberg.org/tenacityteam/tenacity/issues/472
Co-authored-by: Rosalie
Signed-off-by: Avery King <[email protected]>
  • Loading branch information
generic-pers0n committed Sep 14, 2024
1 parent d155952 commit e93af7d
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions win/Inno_Setup_Wizard/tenacity.iss.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ VersionInfoVersion={#GetVersionNumbersString(AppExe)}
VersionInfoCopyright={#GetFileCopyright(AppExe)}

; Default install location
DefaultDirName={commonpf}\Tenacity
DefaultDirName={autopf}\Tenacity

; Tells explorer to refresh file assocations to pickup any changes
ChangesAssociations=yes
Expand Down Expand Up @@ -146,8 +146,8 @@ begin
end;

[Icons]
Name: "{commonprograms}\Tenacity"; Filename: "{app}\tenacity.exe"
Name: "{commondesktop}\Tenacity"; Filename: "{app}\tenacity.exe"; Tasks: desktopicon
Name: "{autoprograms}\Tenacity"; Filename: "{app}\tenacity.exe"
Name: "{autodesktop}\Tenacity"; Filename: "{app}\tenacity.exe"; Tasks: desktopicon

[InstallDelete]

Expand Down Expand Up @@ -206,17 +206,17 @@ Type: files; Name: "{app}\Plug-Ins\clicktrack.ny"
[Registry]
; No longer allow user to choose whether to associate AUP file type with Tenacity.
; Leaving this one commented out example of the old way.
; Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; Tasks: associate_aup
Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: ".AUP3"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: "Tenacity.Project\OpenWithList\tenacity.exe"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: "Tenacity.Project"; ValueType: string; ValueData: "Tenacity Project File"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: "Tenacity.Project\shell"; ValueType: string; ValueData: ""; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: "Tenacity.Project\shell\open"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKCR; Subkey: "Tenacity.Project\shell\open\command"; ValueType: string; ValueData: """{app}\tenacity.exe"" ""%1"""; Flags: uninsdeletekey;
; Root: HKA; Subkey: "Software\Classes\.AUP"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; Tasks: associate_aup
Root: HKA; Subkey: "Software\Classes\.AUP"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKA; Subkey: "Software\Classes\.AUP3"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKA; Subkey: "Software\Classes\Tenacity.Project\OpenWithList\tenacity.exe"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKA; Subkey: "Software\Classes\Tenacity.Project"; ValueType: string; ValueData: "Tenacity Project File"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKA; Subkey: "Software\Classes\Tenacity.Project\shell"; ValueType: string; ValueData: ""; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKA; Subkey: "Software\Classes\Tenacity.Project\shell\open"; Flags: createvalueifdoesntexist uninsdeletekey;
Root: HKA; Subkey: "Software\Classes\Tenacity.Project\shell\open\command"; ValueType: string; ValueData: """{app}\tenacity.exe"" ""%1"""; Flags: uninsdeletekey;

;The following would allow a following 'help' installer to know where to put the 'help' files.
;Root: HKCR; Subkey: "Tenacity.Project\Path"; ValueType: string; ValueData: {app}; Flags: createvalueifdoesntexist uninsdeletekey;
;Root: HKA; Subkey: "Software\Classes\Tenacity.Project\Path"; ValueType: string; ValueData: {app}; Flags: createvalueifdoesntexist uninsdeletekey;

[Run]
Filename: "{app}\tenacity.exe"; Description: "{cm:LaunchProgram,Tenacity}"; Flags: nowait postinstall skipifsilent
Expand Down

0 comments on commit e93af7d

Please sign in to comment.