Forward the profile list to the sub commands

grisp · Oct 7, 2024 · b04fecd · b04fecd
1 parent cb2b6c0
commit b04fecd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/rebar3_grisp_firmware.erl b/src/rebar3_grisp_firmware.erl
@@ -172,6 +172,13 @@ get_bundle(RState, Refresh, RelName, RelVsn, ExtraRelArgs) ->
 
 deploy_bundle(RState, Refresh, RelName, RelVsn, ExtraRelArgs) ->
     Args = [
+        "as"
+    ] ++ [
+        lists:join(",", [atom_to_list(P)
+                         || P <- rebar_state:current_profiles(RState)])
+    ] ++ [
+        "grisp",
+        "deploy",
         "--tar",
         "--relname", atom_to_list(RelName),
         "--relvsn", RelVsn,
@@ -183,7 +190,7 @@ deploy_bundle(RState, Refresh, RelName, RelVsn, ExtraRelArgs) ->
         [_|_] -> ["--" | ExtraRelArgs];
         _ -> []
     end,
-    case rebar3:run(["grisp", "deploy" | Args]) of
+    case rebar3:run(Args) of
         {error, _Reason} = Error -> Error;
         {ok, _} -> {ok, RState}
     end.

diff --git a/src/rebar3_grisp_pack.erl b/src/rebar3_grisp_pack.erl
@@ -203,6 +203,13 @@ get_firmware(RState, Refresh, RelName, RelVsn, ExtraRelArgs) ->
 
 build_firmwares(RState, WithBoot, Refresh, RelName, RelVsn, ExtraRelArgs) ->
     Args = [
+        "as"
+    ] ++ [
+        lists:join(",", [atom_to_list(P)
+                         || P <- rebar_state:current_profiles(RState)])
+    ] ++ [
+        "grisp",
+        "firmware",
         "--relname", atom_to_list(RelName),
         "--relvsn", RelVsn,
         "--force",
@@ -217,7 +224,7 @@ build_firmwares(RState, WithBoot, Refresh, RelName, RelVsn, ExtraRelArgs) ->
         [_|_] -> ["--" | ExtraRelArgs];
         _ -> []
     end,
-    case rebar3:run(["grisp", "firmware" | Args]) of
+    case rebar3:run(Args) of
         {error, _Reason} = Error -> Error;
         {ok, _} -> {ok, RState}
     end.

diff --git a/src/rebar3_grisp_util.erl b/src/rebar3_grisp_util.erl
@@ -311,7 +311,8 @@ index_releases(Releases) ->
 
 profile_postfix(RebarState) ->
     AllProfiles = rebar_state:current_profiles(RebarState),
-    case [atom_to_binary(P) || P <- AllProfiles, P =/= default, P =/= grisp, P =/= test] of
+    case [atom_to_binary(P) || P <- AllProfiles,
+                               P =/= default, P =/= grisp, P =/= test] of
         [] -> <<"">>;
         Profiles -> iolist_to_binary([".", lists:join($+, Profiles)])
     end.