Browse Source

format versions in `uninstall` (#125)

Fixes #122
remotes/origin/add-simple-redirecting-site
Gal Schlezinger 6 years ago committed by GitHub
parent
commit
87430e1961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      executable/Uninstall.re
  2. 2
      executable/Use.re
  3. 2
      library/Http.re
  4. 2
      library/Versions.re

15
executable/Uninstall.re

@ -1,11 +1,13 @@
open Fnm; open Fnm;
open Lwt; open Lwt.Infix;
let run = (~version) => { let run = (~version) => {
let version = Versions.format(version);
let%lwt installedVersion =
Versions.getInstalledVersions() Versions.getInstalledVersions()
>|= List.find_opt(x => Versions.Local.(x.name == version)) >|= List.find_opt(x => Versions.Local.(x.name == version));
>>= (
installedVersion =>
switch (installedVersion) { switch (installedVersion) {
| None => | None =>
Logger.error( Logger.error(
@ -34,8 +36,7 @@ let run = (~version) => {
</Pastel> </Pastel>
" has correctly been removed." " has correctly been removed."
</Pastel>, </Pastel>,
)
|> Lwt.return;
}
); );
Lwt.return_unit;
};
}; };

2
executable/Use.re

@ -20,7 +20,7 @@ let error = (~quiet, arg) =>
}; };
let switchVersion = (~version, ~quiet) => { let switchVersion = (~version, ~quiet) => {
open Lwt; open Lwt.Infix;
let info = info(~quiet); let info = info(~quiet);
let debug = debug(~quiet); let debug = debug(~quiet);
let%lwt parsedVersion = let%lwt parsedVersion =

2
library/Http.re

@ -1,4 +1,4 @@
open Lwt; open Lwt.Infix;
open Cohttp; open Cohttp;
open Cohttp_lwt_unix; open Cohttp_lwt_unix;

2
library/Versions.re

@ -46,7 +46,7 @@ module Local = {
let remove = version => Fs.rmdir(version.fullPath); let remove = version => Fs.rmdir(version.fullPath);
let getLatestInstalledNameByPrefix = prefix => { let getLatestInstalledNameByPrefix = prefix => {
open Lwt; open Lwt.Infix;
let%lwt versions = let%lwt versions =
Lwt.catch( Lwt.catch(
() => () =>

Loading…
Cancel
Save