From 24b6bcce152e2e10bb40de5e1f61494224c9fdd6 Mon Sep 17 00:00:00 2001 From: Oscar Reinecke Date: Tue, 7 Oct 2014 13:31:17 +0200 Subject: [PATCH 1/3] Fixed bad windows temp file. Windows apparently also accepts normal slashes, so this pretty much does the trick. --- src/couch_plugins.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/couch_plugins.erl b/src/couch_plugins.erl index 0f7dbbe..ebdfc3b 100644 --- a/src/couch_plugins.erl +++ b/src/couch_plugins.erl @@ -180,7 +180,7 @@ delete_files(Name, Version) -> % downloads a pluygin .tar.gz into a local plugins directory -spec download(string()) -> ok | {error, string()}. download({Name, _BaseUrl, Version, _Checksums}=Plugin) -> - TargetFile = "/tmp/" ++ get_filename(Name, Version), + TargetFile = os:getenv("TMP") ++ "/" ++ get_filename(Name, Version), case file_exists(TargetFile) of %% wipe and redownload true -> file:delete(TargetFile); From 41ef33d727dd99f60a5b76560897804d216fb2be Mon Sep 17 00:00:00 2001 From: Oscar Reinecke Date: Tue, 7 Oct 2014 14:51:07 +0200 Subject: [PATCH 2/3] Used filename:join to prevent duplicate slashes. --- src/couch_plugins.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/couch_plugins.erl b/src/couch_plugins.erl index ebdfc3b..a82b214 100644 --- a/src/couch_plugins.erl +++ b/src/couch_plugins.erl @@ -180,7 +180,7 @@ delete_files(Name, Version) -> % downloads a pluygin .tar.gz into a local plugins directory -spec download(string()) -> ok | {error, string()}. download({Name, _BaseUrl, Version, _Checksums}=Plugin) -> - TargetFile = os:getenv("TMP") ++ "/" ++ get_filename(Name, Version), + TargetFile = filename:join(os:getenv("TMP"), get_filename(Name, Version)), case file_exists(TargetFile) of %% wipe and redownload true -> file:delete(TargetFile); From e43a396a57b45d4d59df81942f3f8d2d46e8b17b Mon Sep 17 00:00:00 2001 From: Oscar Reinecke Date: Mon, 13 Oct 2014 14:25:23 +0200 Subject: [PATCH 3/3] Acquired temp dir from mochitemp:gettempdir. --- src/couch_plugins.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/couch_plugins.erl b/src/couch_plugins.erl index a82b214..c6dad48 100644 --- a/src/couch_plugins.erl +++ b/src/couch_plugins.erl @@ -180,7 +180,7 @@ delete_files(Name, Version) -> % downloads a pluygin .tar.gz into a local plugins directory -spec download(string()) -> ok | {error, string()}. download({Name, _BaseUrl, Version, _Checksums}=Plugin) -> - TargetFile = filename:join(os:getenv("TMP"), get_filename(Name, Version)), + TargetFile = filename:join(mochitemp:gettempdir(), get_filename(Name, Version)), case file_exists(TargetFile) of %% wipe and redownload true -> file:delete(TargetFile);