From 1a6b4d2d570410d062cec6e2766f36e37f1eafae Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Wed, 24 Nov 2021 17:19:42 -0300 Subject: [PATCH] chore(appup): minor fixes to update_appup.escript (5.0) - Fixes clause error on `create_stub/1`. - Small optimization: do not download the same file multiple times with `wget`. - Fix: remove old file extension (`.app.src`) and preserve dirname when creating stubs for apps. --- scripts/update_appup.escript | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index 39a71b492..8c420c1bd 100755 --- a/scripts/update_appup.escript +++ b/scripts/update_appup.escript @@ -154,7 +154,7 @@ download_prev_release(Tag, #{binary_rel_url := {ok, URL0}, clone_url := Repo}) - Dir = filename:basename(Repo, ".git") ++ [$-|Tag], Filename = filename:join(BaseDir, Dir), Script = "mkdir -p ${OUTFILE} && - wget -O ${OUTFILE}.zip ${URL} && + wget -c -O ${OUTFILE}.zip ${URL} && unzip -n -d ${OUTFILE} ${OUTFILE}.zip", Env = [{"TAG", Tag}, {"OUTFILE", Filename}, {"URL", URL}], bash(Script, Env), @@ -298,12 +298,15 @@ render_appfile(File, Upgrade, Downgrade) -> ok = file:write_file(File, IOList). create_stub(App) -> - case locate(src, App, ".app.src") of + Ext = ".app.src", + case locate(src, App, Ext) of {ok, AppSrc} -> - AppupFile = filename:basename(AppSrc) ++ ".appup.src", + DirName = filename:dirname(AppSrc), + AppupFile = filename:basename(AppSrc, Ext) ++ ".appup.src", Default = {<<".*">>, []}, - render_appfile(AppupFile, [Default], [Default]), - AppupFile; + AppupFileFullpath = filename:join(DirName, AppupFile), + render_appfile(AppupFileFullpath, [Default], [Default]), + {ok, AppupFileFullpath}; undefined -> false end.