diff --git a/LICENSE b/LICENSE index 1d36f537..da1aa0cd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Ecor Ventures LLC. +Copyright (c) 2022 Ecor Ventures LLC. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/nvm.iss b/nvm.iss deleted file mode 100644 index dcfa515f..00000000 --- a/nvm.iss +++ /dev/null @@ -1,321 +0,0 @@ -#define MyAppName "NVM for Windows" -#define MyAppShortName "nvm" -#define MyAppLCShortName "nvm" -#define MyAppVersion "1.1.9" -#define MyAppPublisher "Ecor Ventures LLC" -#define MyAppURL "https://github.com/coreybutler/nvm-windows" -#define MyAppExeName "nvm.exe" -#define MyIcon "bin\nodejs.ico" -#define MyAppId "40078385-F676-4C61-9A9C-F9028599D6D3" -#define ProjectRoot "." - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -PrivilegesRequired=admin -; SignTool=MsSign $f -; SignedUninstaller=yes -AppId={#MyAppId} -AppName={#MyAppName} -AppVersion={%AppVersion} -AppVerName={#MyAppName} {%AppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={userappdata}\{#MyAppShortName} -DisableDirPage=no -DefaultGroupName={#MyAppName} -AllowNoIcons=yes -LicenseFile={#ProjectRoot}\LICENSE -OutputDir={#ProjectRoot}\dist\{%AppVersion} -OutputBaseFilename={#MyAppLCShortName}-setup -SetupIconFile={#ProjectRoot}\{#MyIcon} -Compression=lzma -SolidCompression=yes -ChangesEnvironment=yes -DisableProgramGroupPage=yes -ArchitecturesInstallIn64BitMode=x64 ia64 -UninstallDisplayIcon={app}\{#MyIcon} -AppCopyright=Copyright (C) 2018-2021 Ecor Ventures LLC, Corey Butler, and contributors. - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 - -[Files] -Source: "{#ProjectRoot}\bin\*"; DestDir: "{app}"; BeforeInstall: PreInstall; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "{#ProjectRoot}\bin\install.cmd" - -[Icons] -Name: "{group}\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{#MyIcon}" -Name: "{group}\Uninstall {#MyAppShortName}"; Filename: "{uninstallexe}" - -[Code] -var - SymlinkPage: TInputDirWizardPage; - -function IsDirEmpty(dir: string): Boolean; -var - FindRec: TFindRec; - ct: Integer; -begin - ct := 0; - if FindFirst(ExpandConstant(dir + '\*'), FindRec) then - try - repeat - if FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY = 0 then - ct := ct+1; - until - not FindNext(FindRec); - finally - FindClose(FindRec); - Result := ct = 0; - end; -end; - -//function getInstalledVErsions(dir: string): -var - nodeInUse: string; - -procedure TakeControl(np: string; nv: string); -var - path: string; -begin - // Move the existing node.js installation directory to the nvm root & update the path - RenameFile(np,ExpandConstant('{app}')+'\'+nv); - - RegQueryStringValue(HKEY_LOCAL_MACHINE, - 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', - 'Path', path); - - StringChangeEx(path,np+'\','',True); - StringChangeEx(path,np,'',True); - StringChangeEx(path,np+';;',';',True); - - RegWriteExpandStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', path); - - RegQueryStringValue(HKEY_CURRENT_USER, - 'Environment', - 'Path', path); - - StringChangeEx(path,np+'\','',True); - StringChangeEx(path,np,'',True); - StringChangeEx(path,np+';;',';',True); - - RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', path); - - nodeInUse := ExpandConstant('{app}')+'\'+nv; - -end; - -function Ansi2String(AString:AnsiString):String; -var - i : Integer; - iChar : Integer; - outString : String; -begin - outString :=''; - for i := 1 to Length(AString) do - begin - iChar := Ord(AString[i]); //get int value - outString := outString + Chr(iChar); - end; - - Result := outString; -end; - -procedure PreInstall(); -var - TmpResultFile, TmpJS, NodeVersion, NodePath: string; - stdout: Ansistring; - ResultCode: integer; - msg1, msg2, msg3, dir1: Boolean; -begin - // Create a file to check for Node.JS - TmpJS := ExpandConstant('{tmp}') + '\nvm_check.js'; - SaveStringToFile(TmpJS, 'console.log(require("path").dirname(process.execPath));', False); - - // Execute the node file and save the output temporarily - TmpResultFile := ExpandConstant('{tmp}') + '\nvm_node_check.txt'; - Exec(ExpandConstant('{cmd}'), '/C node "'+TmpJS+'" > "' + TmpResultFile + '"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode); - DeleteFile(TmpJS) - - // Process the results - LoadStringFromFile(TmpResultFile,stdout); - NodePath := Trim(Ansi2String(stdout)); - if DirExists(NodePath) then begin - Exec(ExpandConstant('{cmd}'), '/C node -v > "' + TmpResultFile + '"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode); - LoadStringFromFile(TmpResultFile, stdout); - NodeVersion := Trim(Ansi2String(stdout)); - msg1 := SuppressibleMsgBox('Node '+NodeVersion+' is already installed. Do you want NVM to control this version?', mbConfirmation, MB_YESNO, IDYES) = IDNO; - if msg1 then begin - msg2 := SuppressibleMsgBox('NVM cannot run in parallel with an existing Node.js installation. Node.js must be uninstalled before NVM can be installed, or you must allow NVM to control the existing installation. Do you want NVM to control node '+NodeVersion+'?', mbConfirmation, MB_YESNO, IDYES) = IDYES; - if msg2 then begin - TakeControl(NodePath, NodeVersion); - end; - if not msg2 then begin - DeleteFile(TmpResultFile); - WizardForm.Close; - end; - end; - if not msg1 then - begin - TakeControl(NodePath, NodeVersion); - end; - end; - - // Make sure the symlink directory doesn't exist - if DirExists(SymlinkPage.Values[0]) then begin - // If the directory is empty, just delete it since it will be recreated anyway. - dir1 := IsDirEmpty(SymlinkPage.Values[0]); - if dir1 then begin - RemoveDir(SymlinkPage.Values[0]); - end; - if not dir1 then begin - msg3 := SuppressibleMsgBox(SymlinkPage.Values[0]+' will be overwritten and all contents will be lost. Do you want to proceed?', mbConfirmation, MB_OKCANCEL, IDOK) = IDOK; - if msg3 then begin - RemoveDir(SymlinkPage.Values[0]); - end; - if not msg3 then begin - //RaiseException('The symlink cannot be created due to a conflict with the existing directory at '+SymlinkPage.Values[0]); - WizardForm.Close; - end; - end; - end; -end; - -procedure InitializeWizard; -begin - SymlinkPage := CreateInputDirPage(wpSelectDir, - 'Set Node.js Symlink', 'The active version of Node.js will always be available here.', - 'Select the folder in which Setup should create the symlink, then click Next.', - False, ''); - SymlinkPage.Add('This directory will automatically be added to your system path.'); - SymlinkPage.Values[0] := ExpandConstant('{pf}\nodejs'); -end; - -function InitializeUninstall(): Boolean; -var - path: string; - nvm_symlink: string; -begin - SuppressibleMsgBox('Removing NVM for Windows will remove the nvm command and all versions of node.js, including global npm modules.', mbInformation, MB_OK, IDOK); - - // Remove the symlink - RegQueryStringValue(HKEY_LOCAL_MACHINE, - 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', - 'NVM_SYMLINK', nvm_symlink); - RemoveDir(nvm_symlink); - - // Clean the registry - RegDeleteValue(HKEY_LOCAL_MACHINE, - 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', - 'NVM_HOME') - RegDeleteValue(HKEY_LOCAL_MACHINE, - 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', - 'NVM_SYMLINK') - RegDeleteValue(HKEY_CURRENT_USER, - 'Environment', - 'NVM_HOME') - RegDeleteValue(HKEY_CURRENT_USER, - 'Environment', - 'NVM_SYMLINK') - - RegQueryStringValue(HKEY_LOCAL_MACHINE, - 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', - 'Path', path); - - StringChangeEx(path,'%NVM_HOME%','',True); - StringChangeEx(path,'%NVM_SYMLINK%','',True); - StringChangeEx(path,';;',';',True); - - RegWriteExpandStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', path); - - RegQueryStringValue(HKEY_CURRENT_USER, - 'Environment', - 'Path', path); - - StringChangeEx(path,'%NVM_HOME%','',True); - StringChangeEx(path,'%NVM_SYMLINK%','',True); - StringChangeEx(path,';;',';',True); - - RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', path); - - Result := True; -end; - -// Generate the settings file based on user input & update registry -procedure CurStepChanged(CurStep: TSetupStep); -var - path: string; -begin - if CurStep = ssPostInstall then - begin - SaveStringToFile(ExpandConstant('{app}\settings.txt'), 'root: ' + ExpandConstant('{app}') + #13#10 + 'path: ' + SymlinkPage.Values[0] + #13#10, False); - - // Add Registry settings - RegWriteExpandStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'NVM_HOME', ExpandConstant('{app}')); - RegWriteExpandStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'NVM_SYMLINK', SymlinkPage.Values[0]); - RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'NVM_HOME', ExpandConstant('{app}')); - RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'NVM_SYMLINK', SymlinkPage.Values[0]); - - RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppId}_is1', 'DisplayVersion', '{#MyAppVersion}'); - - // Update system and user PATH if needed - RegQueryStringValue(HKEY_LOCAL_MACHINE, - 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', - 'Path', path); - if Pos('%NVM_HOME%',path) = 0 then begin - path := path+';%NVM_HOME%'; - StringChangeEx(path,';;',';',True); - RegWriteExpandStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', path); - end; - if Pos('%NVM_SYMLINK%',path) = 0 then begin - path := path+';%NVM_SYMLINK%'; - StringChangeEx(path,';;',';',True); - RegWriteExpandStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', path); - end; - RegQueryStringValue(HKEY_CURRENT_USER, - 'Environment', - 'Path', path); - if Pos('%NVM_HOME%',path) = 0 then begin - path := path+';%NVM_HOME%'; - StringChangeEx(path,';;',';',True); - RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', path); - end; - if Pos('%NVM_SYMLINK%',path) = 0 then begin - path := path+';%NVM_SYMLINK%'; - StringChangeEx(path,';;',';',True); - RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', path); - end; - end; -end; - -function getSymLink(o: string): string; -begin - Result := SymlinkPage.Values[0]; -end; - -function getCurrentVersion(o: string): string; -begin - Result := nodeInUse; -end; - -function isNodeAlreadyInUse(): boolean; -begin - Result := Length(nodeInUse) > 0; -end; - -[Run] -Filename: "{cmd}"; Parameters: "/C ""mklink /D ""{code:getSymLink}"" ""{code:getCurrentVersion}"""" "; Check: isNodeAlreadyInUse; Flags: runhidden; - -[UninstallDelete] -Type: files; Name: "{app}\nvm.exe"; -Type: files; Name: "{app}\elevate.cmd"; -Type: files; Name: "{app}\elevate.vbs"; -Type: files; Name: "{app}\nodejs.ico"; -Type: files; Name: "{app}\settings.txt"; -Type: filesandordirs; Name: "{app}"; diff --git a/src/nvm.go b/src/nvm.go index 78f1e6c7..31f21e85 100644 --- a/src/nvm.go +++ b/src/nvm.go @@ -943,7 +943,12 @@ func updateRootDir(path string) { } func elevatedRun(name string, arg ...string) (bool, error) { - return run(filepath.Join(env.root, "elevate.cmd"), append([]string{"cmd", "/C", name}, arg...)...) + ok, err := run("cmd", append([]string{"/C", name}, arg...)...) + if err != nil { + ok, err = run(filepath.Join(env.root, "elevate.cmd"), append([]string{"cmd", "/C", name}, arg...)...) + } + + return ok, err } func run(name string, arg ...string) (bool, error) {