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.

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

configure script for MacOS local mode: Fixes #221 #222

Merged
merged 1 commit into from
Jul 9, 2024
Merged

configure script for MacOS local mode: Fixes #221 #222

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
7 changes: 6 additions & 1 deletion src/main/java/io/hyperfoil/tools/qdup/Host.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class Host {
//worked on old fedora but not on fedora 39
//public static final List<String> LOCAL_LINUX_CONNECT_SHELL = Arrays.asList("script", "-q", "/dev/null","/bin/bash");
public static final List<String> LOCAL_LINUX_CONNECT_SHELL = Arrays.asList("script", "-q","-c","/bin/bash","/dev/null");
public static final List<String> LOCAL_MACOS_CONNECT_SHELL = Arrays.asList("script", "-q", "/dev/null", "/bin/bash");
//LOCAL_EXEC uses System.getRuntime().exec(...)
public static final List<String> LOCAL_LINUX_UPLOAD = Arrays.asList("cp","-r","${{source}}","${{destination}}");
public static final List<String> LOCAL_LINUX_DOWNLOAD = Arrays.asList("cp","-r","${{source}}","${{destination}}");
Expand Down Expand Up @@ -284,7 +285,11 @@ public Host(String userName,String hostName,String password,int port,String prom
this.startContainer=Collections.EMPTY_LIST;
this.startConnectedContainer=Collections.EMPTY_LIST;
this.stopContainer=Collections.EMPTY_LIST;
this.connectShell= LOCAL_LINUX_CONNECT_SHELL;
if (System.getProperty("os.name").toUpperCase().contains("MAC")) {
this.connectShell = LOCAL_MACOS_CONNECT_SHELL;
} else {
this.connectShell = LOCAL_LINUX_CONNECT_SHELL;
}
this.removeContainer=Collections.EMPTY_LIST;
this.exec=Collections.EMPTY_LIST;//uses system.getRuntime().exec()
}else{//ssh, remember when that was the only use case?
Expand Down
Loading