Skip to content

Simplify custom repository #32

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

Merged
merged 2 commits into from
Jul 17, 2020
Merged

Simplify custom repository #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4be57d5
Simplify custom repository related code
smorimoto Jul 17, 2020
88145d8
yarn build
smorimoto Jul 17, 2020
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
13 changes: 4 additions & 9 deletions lib/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ function getOpamDownloadUrl(version: string, filename: string) {

async function acquireOpamWindows(version: string, customRepository: string) {
const repository =
customRepository === ""
? "https://github.com/fdopen/opam-repository-mingw.git#opam2"
: customRepository;
customRepository ||
"https://github.com/fdopen/opam-repository-mingw.git#opam2";

let downloadPath;
try {
downloadPath = await tc.downloadTool("https://cygwin.com/setup-x86_64.exe");
Expand Down Expand Up @@ -57,9 +57,8 @@ async function acquireOpamLinux(version: string, customRepository: string) {
const fileName = getOpamFileName(opamVersion);
const downloadUrl = getOpamDownloadUrl(opamVersion, fileName);
const repository =
customRepository === ""
? "https://github.com/ocaml/opam-repository.git"
: customRepository;
customRepository || "https://github.com/ocaml/opam-repository.git";

let downloadPath;
try {
downloadPath = await tc.downloadTool(downloadUrl);
Expand All @@ -85,9 +84,8 @@ async function acquireOpamLinux(version: string, customRepository: string) {

async function acquireOpamDarwin(version: string, customRepository: string) {
const repository =
customRepository === ""
? "https://github.com/ocaml/opam-repository.git"
: customRepository;
customRepository || "https://github.com/ocaml/opam-repository.git";

await exec("brew", ["install", "opam"]);
await exec("opam", ["init", "-yav", repository]);
await exec(path.join(__dirname, "install-ocaml-unix.sh"), [version]);
Expand Down