From 70316924e7146d94fc1e1f1a7dcf1db83bd7cf65 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Wed, 23 Apr 2025 15:14:02 -0700 Subject: [PATCH] feat: adding env var for "dirname" to mirror the logic in electron-builder --- .changeset/soft-doors-play.md | 5 +++++ pkg/download/tool.go | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .changeset/soft-doors-play.md diff --git a/.changeset/soft-doors-play.md b/.changeset/soft-doors-play.md new file mode 100644 index 0000000..f07e60b --- /dev/null +++ b/.changeset/soft-doors-play.md @@ -0,0 +1,5 @@ +--- +"app-builder-bin": minor +--- + +feat: adding env var for "dirname" to mirror the logic in electron-builder diff --git a/pkg/download/tool.go b/pkg/download/tool.go index 0634089..7c0905c 100644 --- a/pkg/download/tool.go +++ b/pkg/download/tool.go @@ -60,7 +60,7 @@ func DownloadWinCodeSign() (string, error) { func downloadFromGithub(name string, version string, checksum string) (string, error) { id := name + "-" + version - return DownloadArtifact(id, GetGithubBaseUrl()+id+"/"+id+".7z", checksum) + return DownloadArtifact(id, GetGithubBaseUrl()+GetGithubReleaseUrl(id)+"/"+id+".7z", checksum) } func GetGithubBaseUrl() string { @@ -80,6 +80,23 @@ func GetGithubBaseUrl() string { return v } +func GetGithubReleaseUrl(defaultName string) string { + v := os.Getenv("NPM_CONFIG_ELECTRON_BUILDER_BINARIES_CUSTOM_DIR") + if len(v) == 0 { + v = os.Getenv("npm_config_electron_builder_binaries_custom_dir") + } + if len(v) == 0 { + v = os.Getenv("npm_package_config_electron_builder_binaries_custom_dir") + } + if len(v) == 0 { + v = os.Getenv("ELECTRON_BUILDER_BINARIES_CUSTOM_DIR") + } + if len(v) == 0 { + v = defaultName + } + return v +} + func DownloadTool(descriptor ToolDescriptor, osName util.OsName) (string, error) { arch := runtime.GOARCH switch arch {