From c950566294f6d0d2af6989984aed915630e31954 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Wed, 24 Nov 2021 14:22:51 -0300 Subject: [PATCH 1/2] chore(appup): minor fixes to update_appup.escript - Fixes clause error on `create_stub/1`. - Small optimization: do not download the same file multiple times with `wget`. --- scripts/update_appup.escript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index 39a71b492..738b65ac7 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), @@ -303,7 +303,7 @@ create_stub(App) -> AppupFile = filename:basename(AppSrc) ++ ".appup.src", Default = {<<".*">>, []}, render_appfile(AppupFile, [Default], [Default]), - AppupFile; + {ok, AppupFile}; undefined -> false end. From 29f982385d2f118c652ff1ca0b6ec53e7e2c4da6 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Wed, 24 Nov 2021 14:58:55 -0300 Subject: [PATCH 2/2] chore(appup): remove old file extension and preserve dirname for apps --- scripts/update_appup.escript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index 738b65ac7..9fc8f618e 100755 --- a/scripts/update_appup.escript +++ b/scripts/update_appup.escript @@ -298,12 +298,14 @@ render_appfile(File, Upgrade, Downgrade) -> ok = file:write_file(File, IOList). create_stub(App) -> - case locate(src, App, ".app.src") of + case locate(src, App, Ext = ".app.src") 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]), - {ok, AppupFile}; + AppupFileFullpath = filename:join(DirName, AppupFile), + render_appfile(AppupFileFullpath, [Default], [Default]), + {ok, AppupFileFullpath}; undefined -> false end.