equal
deleted
inserted
replaced
171 } |
171 } |
172 return null; |
172 return null; |
173 } catch (IOException ex) { |
173 } catch (IOException ex) { |
174 Log.verbose(ex); |
174 Log.verbose(ex); |
175 return null; |
175 return null; |
176 } finally { |
|
177 try { |
|
178 if (appImageDir != null && |
|
179 PREDEFINED_APP_IMAGE.fetchFrom(params) == null && |
|
180 (PREDEFINED_RUNTIME_IMAGE.fetchFrom(params) == null || |
|
181 !Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) && |
|
182 !Log.isDebug() && |
|
183 !Log.isVerbose()) { |
|
184 IOUtils.deleteRecursive(appImageDir); |
|
185 } else if (appImageDir != null) { |
|
186 Log.verbose(MessageFormat.format(I18N.getString( |
|
187 "message.intermediate-image-location"), |
|
188 appImageDir.getAbsolutePath())); |
|
189 } |
|
190 |
|
191 // cleanup |
|
192 cleanupConfigFiles(params); |
|
193 } catch (IOException ex) { |
|
194 Log.debug(ex); |
|
195 // noinspection ReturnInsideFinallyBlock |
|
196 return null; |
|
197 } |
|
198 } |
176 } |
199 } |
177 } |
200 |
178 |
201 private File getPackages_AppPackage(Map<String, ? super Object> params) { |
179 private File getPackages_AppPackage(Map<String, ? super Object> params) { |
202 return new File(PACKAGES_ROOT.fetchFrom(params), |
180 return new File(PACKAGES_ROOT.fetchFrom(params), |
206 private File getPackages_DaemonPackage(Map<String, ? super Object> params) { |
184 private File getPackages_DaemonPackage(Map<String, ? super Object> params) { |
207 return new File(PACKAGES_ROOT.fetchFrom(params), |
185 return new File(PACKAGES_ROOT.fetchFrom(params), |
208 APP_FS_NAME.fetchFrom(params) + "-daemon.pkg"); |
186 APP_FS_NAME.fetchFrom(params) + "-daemon.pkg"); |
209 } |
187 } |
210 |
188 |
211 private void cleanupPackagesFiles(Map<String, ? super Object> params) { |
|
212 if (Log.isDebug() || Log.isVerbose()) { |
|
213 return; |
|
214 } |
|
215 |
|
216 if (getPackages_AppPackage(params) != null) { |
|
217 getPackages_AppPackage(params).delete(); |
|
218 } |
|
219 if (getPackages_DaemonPackage(params) != null) { |
|
220 getPackages_DaemonPackage(params).delete(); |
|
221 } |
|
222 } |
|
223 |
|
224 private File getConfig_DistributionXMLFile( |
189 private File getConfig_DistributionXMLFile( |
225 Map<String, ? super Object> params) { |
190 Map<String, ? super Object> params) { |
226 return new File(CONFIG_ROOT.fetchFrom(params), "distribution.dist"); |
191 return new File(CONFIG_ROOT.fetchFrom(params), "distribution.dist"); |
227 } |
192 } |
228 |
193 |
236 } |
201 } |
237 |
202 |
238 private File getScripts_PostinstallFile( |
203 private File getScripts_PostinstallFile( |
239 Map<String, ? super Object> params) { |
204 Map<String, ? super Object> params) { |
240 return new File(SCRIPTS_DIR.fetchFrom(params), "postinstall"); |
205 return new File(SCRIPTS_DIR.fetchFrom(params), "postinstall"); |
241 } |
|
242 |
|
243 private void cleanupConfigFiles(Map<String, ? super Object> params) { |
|
244 if (Log.isDebug() || Log.isVerbose()) { |
|
245 return; |
|
246 } |
|
247 |
|
248 if (getConfig_DistributionXMLFile(params) != null) { |
|
249 getConfig_DistributionXMLFile(params).delete(); |
|
250 } |
|
251 if (getConfig_BackgroundImage(params) != null) { |
|
252 getConfig_BackgroundImage(params).delete(); |
|
253 } |
|
254 } |
206 } |
255 |
207 |
256 private String getAppIdentifier(Map<String, ? super Object> params) { |
208 private String getAppIdentifier(Map<String, ? super Object> params) { |
257 return IDENTIFIER.fetchFrom(params); |
209 return IDENTIFIER.fetchFrom(params); |
258 } |
210 } |
450 |
402 |
451 return finalPKG; |
403 return finalPKG; |
452 } catch (Exception ignored) { |
404 } catch (Exception ignored) { |
453 Log.verbose(ignored); |
405 Log.verbose(ignored); |
454 return null; |
406 return null; |
455 } finally { |
|
456 cleanupPackagesFiles(params); |
|
457 cleanupConfigFiles(params); |
|
458 } |
407 } |
459 } |
408 } |
460 |
409 |
461 ////////////////////////////////////////////////////////////////////////// |
410 ////////////////////////////////////////////////////////////////////////// |
462 // Implement Bundler |
411 // Implement Bundler |