Skip to content

Commit de4ee40

Browse files
committed
reconciled install script discrepancies
1 parent 12c9aa3 commit de4ee40

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

nvm.iss

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
5454
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
5555

5656
[Files]
57-
Source: "{#ProjectRoot}\bin\*"; DestDir: "{app}"; BeforeInstall: PreInstall; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "{#ProjectRoot}\bin\install.cmd {#ProjectRoot}\bin\nvm-arm64.exe {#ProjectRoot}\bin\nvm-64.exe {#ProjectRoot}\bin\nvm.exe"
58-
Source: "{#ProjectRoot}\bins\nvm-arm64.exe"; DestDir: "{app}"; DestName: "nvm.exe"; Check: InstallARM64; Flags: solidbreak
59-
Source: "{#ProjectRoot}\bins\nvm-64.exe"; DestDir: "{app}"; DestName: "nvm.exe"; Check: InstallX64; Flags: solidbreak
60-
Source: "{#ProjectRoot}\bins\nvm.exe"; DestDir: "{app}"; DestName: "nvm.exe"; Check: InstallOtherArch;
57+
Source: "{#ProjectRoot}\bin\*"; DestDir: "{app}"; BeforeInstall: PreInstall; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "{#ProjectRoot}\bin\install.cmd"
6158

6259
[Icons]
6360
Name: "{group}\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{#MyIcon}"
@@ -71,21 +68,6 @@ Root: HKCR; Subkey: "{#MyAppShortName}\DefaultIcon"; ValueType: string; ValueNam
7168
Root: HKCR; Subkey: "{#MyAppShortName}\shell\launch\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Flags: uninsdeletekey
7269

7370
[Code]
74-
function InstallX64: Boolean;
75-
begin
76-
Result := Is64BitInstallMode and (ProcessorArchitecture = paX64);
77-
end;
78-
79-
function InstallARM64: Boolean;
80-
begin
81-
Result := Is64BitInstallMode and (ProcessorArchitecture = paARM64);
82-
end;
83-
84-
function InstallOtherArch: Boolean;
85-
begin
86-
Result := not InstallX64 and not InstallARM64;
87-
end;
88-
8971
var
9072
SymlinkPage: TInputDirWizardPage;
9173
NotificationOptionPage: TInputOptionWizardPage;

0 commit comments

Comments
 (0)