Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gobblin_password_encryptor should be included in the tarball #629

Merged
merged 1 commit into from
Jan 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public String decryptPassword(String encrypted) {
* provided in the constructor. Otherwise, return the password as is.
*/
public String readPassword(String password) {
if (!this.encryptor.isPresent()) {
if (password == null || !this.encryptor.isPresent()) {
return password;
}
Matcher matcher = PASSWORD_PATTERN.matcher(password);
Expand Down
5 changes: 4 additions & 1 deletion gobblin-distribution/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ task build(type: Tar, overwrite: true) {
compression = Compression.GZIP

into("conf") { from "../conf/" }
into("bin") { from "../bin/" }
into("bin") {
from "../bin/"
from project(':gobblin-utility').projectDir.path + '/src/main/bash/gobblin_password_encryptor.sh'
}
into("lib") {
from configurations.runtime
}
Expand Down