X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/53d879ad21d1f8e0c3a90ec6b552c778d65d1e60..07d0323b84c7a00129cccca645db8d222378d33c:/windows/putty.iss

diff --git a/windows/putty.iss b/windows/putty.iss
index e6d66569..e885221a 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -5,26 +5,32 @@
 ;
 ; TODO for future releases:
 ;
-;  - It would be neighbourly to set up an [UninstallRun] entry that ran
-;    some close cousin of `putty -cleanup', only it should prompt first
-;    in case the user wants to keep stuff. And make the `leave it alone'
-;    button the DEFAULT. And perhaps warn that on NT-style systems not
-;    everything will be caught by this.
+;  - It might be nice to have an option to add PSCP, Plink and PSFTP to
+;    the PATH. This is probably only practical on NT-class systems; I
+;    believe doing this on 9x would require mucking around with
+;    AUTOEXEC.BAT.
 ;
-;  - The Quick Launch bar is an interesting thought. Certainly a fair
-;    number of people actually _believe_ my silly joke about how PuTTY
-;    is the only thing that makes Windows usable, so perhaps they'd like
-;    that. Unchecked by default, though, I think.
-;     * does this need to be conditional on the Windows version?
+;  - Maybe a "custom" installation might be useful? Hassle with icons,
+;    though.
 
 [Setup]
 AppName=PuTTY
-AppVerName=PuTTY version 0.56
+AppVerName=PuTTY version 0.57
+VersionInfoTextVersion=Release 0.57
+AppVersion=0.57
+;FIXME -- enable this when we've got it going for individual EXEs too
+;         and are committed to the version numbering scheme.
+;VersionInfoVersion=0.57.0.0
+AppPublisher=Simon Tatham
+AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/
+AppReadmeFile={app}\README.txt
 DefaultDirName={pf}\PuTTY
 DefaultGroupName=PuTTY
 UninstallDisplayIcon={app}\putty.exe
 ChangesAssociations=yes
+;ChangesEnvironment=yes -- when PATH munging is sorted (probably)
 Compression=zip/9
+AllowNoIcons=yes
 
 [Files]
 Source: "putty.exe"; DestDir: "{app}"
@@ -40,18 +46,23 @@ Source: "..\LICENCE"; DestDir: "{app}"
 Source: "..\README.txt"; DestDir: "{app}"; Flags: isreadme
 
 [Icons]
-Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: startmenu
-Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.hlp"; Tasks: startmenu
-Name: "{group}\PuTTY Web Site"; Filename: "{app}\website.url"; Tasks: startmenu
-Name: "{group}\PSFTP"; Filename: "{app}\psftp.exe"; Tasks: startmenu
-Name: "{group}\PuTTYgen"; Filename: "{app}\puttygen.exe"; Tasks: startmenu
-Name: "{group}\Pageant"; Filename: "{app}\pageant.exe"; Tasks: startmenu
-Name: "{userdesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon
+Name: "{group}\PuTTY"; Filename: "{app}\putty.exe"; Comment: "SSH, Telnet and Rlogin client";
+Name: "{group}\PuTTY Manual"; Filename: "{app}\putty.hlp"
+Name: "{group}\PuTTY Web Site"; Filename: "{app}\website.url"
+Name: "{group}\PSFTP"; Filename: "{app}\psftp.exe"; Comment: "Command-line interactive SFTP client"
+Name: "{group}\PuTTYgen"; Filename: "{app}\puttygen.exe"; Comment: "PuTTY SSH key generation utility"
+Name: "{group}\Pageant"; Filename: "{app}\pageant.exe"; Comment: "PuTTY SSH authentication agent"
+Name: "{commondesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\common
+Name: "{userdesktop}\PuTTY"; Filename: "{app}\putty.exe"; Tasks: desktopicon\user
+; Putting this in {commonappdata} doesn't seem to work, on 98SE at least.
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\PuTTY"; Filename: "{app}\putty.exe"; Tasks: quicklaunchicon
 
 [Tasks]
-Name: startmenu; Description: "Create a &Start Menu group"
-Name: desktopicon; Description: "Create a &desktop icon for PuTTY"
-Name: associate; Description: "&Associate .PPK files (PuTTY Private Key) with Pageant"
+Name: desktopicon; Description: "Create a &desktop icon for PuTTY"; GroupDescription: "Additional icons:"; Flags: unchecked
+Name: desktopicon\common; Description: "For all users"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked
+Name: desktopicon\user; Description: "For the current user only"; GroupDescription: "Additional icons:"; Flags: exclusive unchecked
+Name: quicklaunchicon; Description: "Create a &Quick Launch icon for PuTTY (current user only)"; GroupDescription: "Additional icons:"; Flags: unchecked
+Name: associate; Description: "&Associate .PPK files (PuTTY Private Key) with Pageant and PuTTYgen"; GroupDescription: "Other tasks:"
 
 [Registry]
 Root: HKCR; Subkey: ".ppk"; ValueType: string; ValueName: ""; ValueData: "PuTTYPrivateKey"; Flags: uninsdeletevalue; Tasks: associate
@@ -60,3 +71,9 @@ Root: HKCR; Subkey: "PuTTYPrivateKey\DefaultIcon"; ValueType: string; ValueName:
 Root: HKCR; Subkey: "PuTTYPrivateKey\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\pageant.exe"" ""%1"""; Tasks: associate
 Root: HKCR; Subkey: "PuTTYPrivateKey\shell\edit"; ValueType: string; ValueName: ""; ValueData: "&Edit"; Tasks: associate
 Root: HKCR; Subkey: "PuTTYPrivateKey\shell\edit\command"; ValueType: string; ValueName: ""; ValueData: """{app}\puttygen.exe"" ""%1"""; Tasks: associate
+; Add to PATH on NT-class OS?
+
+[UninstallRun]
+; -cleanup-during-uninstall is an undocumented option that tailors the
+; message displayed.
+Filename: "{app}\putty.exe"; Parameters: "-cleanup-during-uninstall"; RunOnceId: "PuTTYCleanup"; StatusMsg: "Cleaning up saved sessions etc (optional)..."