Skip to content

[JENKINS-37341] quick fix to allow sh step to execute under z/OS USS sh #76

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.

Sign up for GitHub

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

Closed
mad8vad wants to merge 2 commits into from
Closed

[JENKINS-37341] quick fix to allow sh step to execute under z/OS USS sh #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75bf6f
quick fix for sh for z/OS
mad8vad Jul 13, 2018
d288b9a
removed import
mad8vad Jul 13, 2018
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
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public String getScript() {
String defaultShell = jenkins.getInjector().getInstance(Shell.DescriptorImpl.class).getShellOrDefault(ws.getChannel());
s = "#!"+defaultShell+" -xe\n" + s;
}
shf.write(s, "UTF-8");
shf.write(s, "CP1047");
shf.chmod(0755);

scriptPath = shf.getRemote();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private static class WriteLog extends MasterToSlaveFileCallable<Long> {
// TODO is this efficient for large amounts of output? Would it be better to stream data, or return a byte[] from the callable?
byte[] buf = new byte[(int) toRead];
raf.readFully(buf);
sink.write(buf);
sink.write(new String(buf, "CP1047").getBytes());
} finally {
raf.close();
}
Expand All @@ -172,7 +172,7 @@ static class StatusCheck extends MasterToSlaveFileCallable<Integer> {
public Integer invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
if (f.exists() && f.length() > 0) {
try {
String fileString = Files.readFirstLine(f, Charset.defaultCharset());
String fileString = Files.readFirstLine(f, Charset.forName("CP1047"));
if (fileString == null || fileString.isEmpty()) {
return null;
} else {
Expand Down