This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 189529
Collapse All | Expand All

(-)a/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/WindowsSupport.java (-2 / +2 lines)
Lines 185-191 Link Here
185 
                            // The problem is that is is not in registry...
 185 
                            // The problem is that is is not in registry...
186 
                            // I.e. we will use it if on msys found on the system...
 186 
                            // I.e. we will use it if on msys found on the system...
187 
                            if (candidate == null) {
 187 
                            if (candidate == null) {
188 
                                candidate = new Shell(ShellType.CYGWIN, sh.getAbsolutePath(), parent);
 188 
                                candidate = new Shell(ShellType.CYGWIN, new File(sh.getParentFile(), "bash.exe").getAbsolutePath(), parent);
189 
                            }
 189 
                            }
190 
                            // Still there is a chance that this installation is
 190 
                            // Still there is a chance that this installation is
191 
                            // OK (even if it is not in the registry).
 191 
                            // OK (even if it is not in the registry).
Lines 343-349 Link Here
343 
            return null;
 343 
            return null;
344 
        }
 344 
        }
345 

          345
          

        

          
            

              346
              
        File sh = new File(root + "/bin/sh.exe"); // NOI18N


              346
              
        File sh = (type == ShellType.CYGWIN) ? new File(root + "/bin/bash.exe") : new File(root + "/bin/sh.exe"); // NOI18N

            

        

          347
          

          347
          

        

        

          348
          
        if (!sh.exists() || !sh.canRead()) {

          348
          
        if (!sh.exists() || !sh.canRead()) {

        

        

          349
          
            return null;

          349
          
            return null;

        



(-)a/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/TerminalAction.java
      (+3 lines)




  

    
      
            Lines 133-138
          
      
      
        Link Here
      
    
  

        

          133
          
                            String shell = hostInfo.getLoginShell();

          133
          
                            String shell = hostInfo.getLoginShell();

        

        

          134
          
//                            npb.setWorkingDirectory("${HOME}");

          134
          
//                            npb.setWorkingDirectory("${HOME}");

        

        

          135
          
                            npb.setExecutable(shell);

          135
          
                            npb.setExecutable(shell);

        

            

              
              
              136
              
							if (shell.endsWith("bash") || shell.endsWith("bash.exe")) {

            

            

              137
              
								npb.setArguments("--login");

            

            

              138
              
							}

            

        

          136
          
                            NativeExecutionDescriptor descr;

          139
          
                            NativeExecutionDescriptor descr;

        

        

          137
          
                            descr = new NativeExecutionDescriptor().controllable(true).frontWindow(true).inputVisible(false).inputOutput(io);

          140
          
                            descr = new NativeExecutionDescriptor().controllable(true).frontWindow(true).inputVisible(false).inputOutput(io);

        

        

          138
          
                            NativeExecutionService es = NativeExecutionService.newService(npb, descr, "Terminal Emulator"); // NOI18N

          141
          
                            NativeExecutionService es = NativeExecutionService.newService(npb, descr, "Terminal Emulator"); // NOI18N

        






  

  Return to bug 189529