Skip to content

Update PowerShell.java #73

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

Open
mbrebion wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update PowerShell.java #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/main/java/com/profesorfalken/jpowershell/PowerShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class PowerShell implements AutoCloseable {

// Process to store PowerShell session
private Process p;
private ProcessBuilder pb;
//PID of the process
private long pid = -1;
// Writer to send commands
Expand All @@ -58,7 +59,8 @@ public class PowerShell implements AutoCloseable {
private int waitPause = 5;
private long maxWait = 10000;
private File tempFolder = null;

private File workingDirectory = null;

// Variables used for script mode
private boolean scriptMode = false;
public static final String END_SCRIPT_STRING = "--END-JPOWERSHELL-SCRIPT--";
Expand Down Expand Up @@ -92,6 +94,8 @@ public PowerShell configuration(Map<String, String> config) {
: PowerShellConfig.getConfig().getProperty("maxWait"));
this.tempFolder = (config != null && config.get("tempFolder") != null) ? getTempFolder(config.get("tempFolder"))
: getTempFolder(PowerShellConfig.getConfig().getProperty("tempFolder"));
this.workingDirectory = (config != null && config.get("workingDirectory") != null) ? getTempFolder(config.get("workingDirectory"))
: getTempFolder(PowerShellConfig.getConfig().getProperty("workingDirectory"));
} catch (NumberFormatException nfe) {
logger.log(Level.SEVERE,
"Could not read configuration. Using default values.", nfe);
Expand Down Expand Up @@ -132,10 +136,14 @@ public static PowerShell openSession(String customPowerShellExecutablePath) thro
return powerShell.initalize(powerShellExecutablePath);
}

private void setWorkingDirectory(File directory){
pb.directory(directory);
}

// Initializes PowerShell console in which we will enter the commands
private PowerShell initalize(String powerShellExecutablePath) throws PowerShellNotAvailableException {
String codePage = PowerShellCodepage.getIdentifierByCodePageName(Charset.defaultCharset().name());
ProcessBuilder pb;


//Start powershell executable in process
if (OSDetector.isWindows()) {
Expand Down Expand Up @@ -188,6 +196,7 @@ public PowerShellResponse executeCommand(String command) {
boolean isError = false;
boolean timeout = false;

this.setWorkingDirectory(workingDirectory);
checkState();

PowerShellCommandProcessor commandProcessor = new PowerShellCommandProcessor("standard", p.getInputStream(),
Expand Down