Skip to content

Commit 0ff5562

Browse files
committed
Search wp.bat in Windows #63
1 parent 54bc9ec commit 0ff5562

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/org/netbeans/modules/php/wordpress/commands/WordPressCli.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@
8181
*/
8282
public final class WordPressCli {
8383

84-
public static String NAME = "wp"; // NOI18N
85-
public static String LONG_NAME = "wp-cli.phar"; // NOI18N
84+
public static final String NAME = "wp"; // NOI18N
85+
public static final String LONG_NAME = "wp-cli.phar"; // NOI18N
86+
public static final String NAME_BAT = "wp.bat"; // NOI18N
8687

8788
private final String wpCliPath;
8889
private boolean noReset = false;

src/org/netbeans/modules/php/wordpress/ui/options/WordPressOptionsPanel.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import javax.swing.event.DocumentEvent;
5656
import javax.swing.event.DocumentListener;
5757
import org.netbeans.api.progress.ProgressHandle;
58-
import org.netbeans.api.progress.ProgressHandleFactory;
5958
import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
6059
import org.netbeans.modules.php.api.util.FileUtils;
6160
import org.netbeans.modules.php.api.util.StringUtils;
@@ -69,6 +68,7 @@
6968
import org.openide.util.Exceptions;
7069
import org.openide.util.NbBundle;
7170
import org.openide.util.RequestProcessor;
71+
import org.openide.util.Utilities;
7272

7373
final class WordPressOptionsPanel extends javax.swing.JPanel {
7474

@@ -537,6 +537,9 @@ private void wpCliSearchButtonActionPerformed(java.awt.event.ActionEvent evt) {/
537537
String script = UiUtils.SearchWindow.search(new UiUtils.SearchWindow.SearchWindowSupport() {
538538
@Override
539539
public List<String> detect() {
540+
if (Utilities.isWindows()) {
541+
return FileUtils.findFileOnUsersPath(WordPressCli.NAME, WordPressCli.LONG_NAME, WordPressCli.NAME_BAT);
542+
}
540543
return FileUtils.findFileOnUsersPath(WordPressCli.NAME, WordPressCli.LONG_NAME);
541544
}
542545

0 commit comments

Comments
 (0)