@@ -109,36 +109,17 @@ defmodule Mix.Tasks.Firmware do
109
109
110
110
write_erlinit_config ( build_rootfs_overlay )
111
111
112
- project_rootfs_overlay =
113
- case firmware_config [ :rootfs_overlay ] || firmware_config [ :rootfs_additions ] do
114
- nil ->
115
- [ ]
116
-
117
- overlays when is_list ( overlays ) ->
118
- overlays
119
-
120
- overlay ->
121
- [ Path . expand ( overlay ) ]
122
- end
123
-
112
+ project_rootfs_overlay = config_arg ( :rootfs_overlay , firmware_config )
124
113
prevent_overlay_overwrites! ( project_rootfs_overlay )
125
114
126
115
rootfs_overlays =
127
116
[ build_rootfs_overlay | project_rootfs_overlay ]
128
117
|> Enum . map ( & [ "-a" , & 1 ] )
129
118
|> List . flatten ( )
130
119
131
- fwup_conf =
132
- case firmware_config [ :fwup_conf ] do
133
- nil -> [ ]
134
- fwup_conf -> [ "-c" , Path . join ( File . cwd! ( ) , fwup_conf ) ]
135
- end
120
+ fwup_conf = config_arg ( :fwup_conf , firmware_config )
136
121
137
- post_processing_script =
138
- case firmware_config [ :post_processing_script ] do
139
- nil -> [ ]
140
- script when is_binary ( script ) -> [ "-s" , script ]
141
- end
122
+ post_processing_script = config_arg ( :post_processing_script , firmware_config )
142
123
143
124
fw = [ "-f" , fw_out ]
144
125
release_path = Path . join ( Mix.Project . build_path ( ) , "rel/#{ otp_app } " )
@@ -307,4 +288,31 @@ defmodule Mix.Tasks.Firmware do
307
288
""" )
308
289
end
309
290
end
291
+
292
+ defp config_arg ( :rootfs_overlay , firmware_config ) do
293
+ case firmware_config [ :rootfs_overlay ] || firmware_config [ :rootfs_additions ] do
294
+ nil ->
295
+ [ ]
296
+
297
+ overlays when is_list ( overlays ) ->
298
+ overlays
299
+
300
+ overlay ->
301
+ [ Path . expand ( overlay ) ]
302
+ end
303
+ end
304
+
305
+ defp config_arg ( :fwup_conf , firmware_config ) do
306
+ case firmware_config [ :fwup_conf ] do
307
+ nil -> [ ]
308
+ fwup_conf -> [ "-c" , Path . join ( File . cwd! ( ) , fwup_conf ) ]
309
+ end
310
+ end
311
+
312
+ defp config_arg ( :post_processing_script , firmware_config ) do
313
+ case firmware_config [ :post_processing_script ] do
314
+ nil -> [ ]
315
+ script when is_binary ( script ) -> [ "-s" , script ]
316
+ end
317
+ end
310
318
end
0 commit comments