Skip to content

feat: update proxy binaries on self-update #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: update proxy binaries on self-update #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/choosenim.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ proc updateSelf(params: CliParams) =
display("Info:", "Updated choosenim to version " & $version,
Success, HighPriority)

# Any Nim installation currently activated by choosenim?
if $getCurrentVersion(params) != "":
discard installProxies(params)

proc update(params: CliParams) =
if params.commands.len != 2:
raise newException(ChooseNimError,
Expand Down
46 changes: 29 additions & 17 deletions src/choosenimpkg/switcher.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,31 @@ proc writeProxy(bin: string, params: CliParams) =
display("Hint:", "Ensure that '$1' is before '$2' in the PATH env var." %
[params.getBinDir(), fromPATH.splitFile.dir], Warning, HighPriority)

proc installProxies*(params: CliParams): bool =
## Install or update proxy executables.
##
## Returns `true` when any proxies were newly installed or updated,
## `false` otherwise.
var proxiesToInstall = @proxies

# Handle MingW proxies.
when defined(windows):
if not isDefaultCCInPath(params):
let mingwBin = getMingwBin(params)
if not fileExists(mingwBin / "gcc".addFileExt(ExeExt)):
let msg = "No 'gcc' binary found in '$1'." % mingwBin
raise newException(ChooseNimError, msg)

proxiesToInstall.add(mingwProxies)

if not params.areProxiesInstalled(proxiesToInstall):
# Create the proxy executables.
for proxy in proxiesToInstall:
writeProxy(proxy, params)
return true

return false

proc switchToPath(filepath: string, params: CliParams): bool =
## Switches to the specified file path that should point to the root of
## the Nim repo.
Expand All @@ -254,30 +279,17 @@ proc switchToPath(filepath: string, params: CliParams): bool =
"running `choosenim \"#v0.16.0\"` or similar.",
Warning, HighPriority)

var proxiesToInstall = @proxies
# Handle MingW proxies.
when defined(windows):
if not isDefaultCCInPath(params):
let mingwBin = getMingwBin(params)
if not fileExists(mingwBin / "gcc".addFileExt(ExeExt)):
let msg = "No 'gcc' binary found in '$1'." % mingwBin
raise newException(ChooseNimError, msg)

proxiesToInstall.add(mingwProxies)

# Return early if this version is already selected.
let selectedPath = params.getSelectedPath()
let proxiesInstalled = params.areProxiesInstalled(proxiesToInstall)
let
selectedPath = params.getSelectedPath()
proxiesInstalled = not installProxies(params)

if selectedPath == filepath and proxiesInstalled:
return false
else:
# Write selected path to "current file".
writeFile(params.getCurrentFile(), filepath)

# Create the proxy executables.
for proxy in proxiesToInstall:
writeProxy(proxy, params)

when defined(windows):
if not isNimbleBinInPath(params):
display("Hint:", "Use 'choosenim <version/channel> --firstInstall' to add\n" &
Expand Down