Browse Source

Merge pull request #1256 in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0

* commit '8eac5482864d14c38731b412d9abb6ce3719a5aa':
  REPORT-19946 Linux设计器
  REPORT-19946 Linux设计器
feature/big-screen
pengda 5 years ago
parent
commit
12295716b0
  1. 3
      designer-base/src/main/java/com/fr/design/os/impl/DemoAction.java
  2. 3
      designer-base/src/main/java/com/fr/design/os/impl/RestartAction.java

3
designer-base/src/main/java/com/fr/design/os/impl/DemoAction.java

@ -21,13 +21,12 @@ public class DemoAction implements OSBasedAction {
} }
String executorPath; String executorPath;
if (OperatingSystem.isMacos()) { if (OperatingSystem.isMacos()) {
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.app"); executorPath = StableUtils.pathJoin(installHome, "bin", "designer.app");
} else if(OperatingSystem.isWindows()){ } else if(OperatingSystem.isWindows()){
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.exe demo"); executorPath = StableUtils.pathJoin(installHome, "bin", "designer.exe demo");
}else{ }else{
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.sh demo"); executorPath = StableUtils.pathJoin(installHome, "bin", "designer demo");
} }
if (OperatingSystem.isMacos()) { if (OperatingSystem.isMacos()) {

3
designer-base/src/main/java/com/fr/design/os/impl/RestartAction.java

@ -65,8 +65,7 @@ public class RestartAction implements OSBasedAction {
private static void restartInLinux(String installHome, String[] filesToBeDelete) throws Exception { private static void restartInLinux(String installHome, String[] filesToBeDelete) throws Exception {
ProcessBuilder builder = new ProcessBuilder(); ProcessBuilder builder = new ProcessBuilder();
List<String> commands = new ArrayList<String>(); List<String> commands = new ArrayList<String>();
//现在先写的是restart.sh commands.add(installHome + File.separator + "bin" + File.separator + "restart");
commands.add(installHome + File.separator + "bin" + File.separator + "restart.sh");
if (ArrayUtils.isNotEmpty(filesToBeDelete)) { if (ArrayUtils.isNotEmpty(filesToBeDelete)) {
commands.add(StableUtils.join(filesToBeDelete, "+")); commands.add(StableUtils.join(filesToBeDelete, "+"));
} }

Loading…
Cancel
Save