Merge branch '1.2.x'
This commit is contained in:
commit
ce73dec992
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2014 the original author or authors.
|
* Copyright 2012-2015 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -110,6 +110,8 @@ class ProjectGenerator {
|
||||||
new ByteArrayInputStream(entity.getContent()));
|
new ByteArrayInputStream(entity.getContent()));
|
||||||
try {
|
try {
|
||||||
extractFromStream(zipStream, overwrite, outputFolder);
|
extractFromStream(zipStream, overwrite, outputFolder);
|
||||||
|
fixExecutableFlag(outputFolder, "mvnw");
|
||||||
|
fixExecutableFlag(outputFolder, "gradlew");
|
||||||
Log.info("Project extracted to '" + outputFolder.getAbsolutePath() + "'");
|
Log.info("Project extracted to '" + outputFolder.getAbsolutePath() + "'");
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
|
@ -158,4 +160,11 @@ class ProjectGenerator {
|
||||||
Log.info("Content saved to '" + output + "'");
|
Log.info("Content saved to '" + output + "'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void fixExecutableFlag(File dir, String fileName) {
|
||||||
|
File f = new File(dir, fileName);
|
||||||
|
if (f.exists()) {
|
||||||
|
f.setExecutable(true, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue