fix: cannot find vscode-ripgrep binary

This commit is contained in:
Noah Klayman
2020-05-29 13:22:19 -07:00
parent 4e1df50b01
commit 8cd470aa3e
6 changed files with 12 additions and 6 deletions

View File

@@ -9,6 +9,7 @@ Currently only working in Linux
1. Clone this repository and open a terminal in the root of it. Make sure to use Node v10.x
2. Install deps with `yarn`
3. Package Theia server as an executable with `yarn theia:package`
4. Run `yarn tauri build` to build the executable (read note below)
4. Copy the executable in `node_modules/vscode-ripgrep/bin/rg` to `src-tauri/theia-binaries/rg-x86_64-unknown-linux-gnu`
5. Run `yarn tauri build` to build the executable (read note below)
**NOTE:** Building the app will fail the first time. To fix this, you will need to rename the binary in `src-tauri/theia-binaries/theia` to the path in the error message from `yarn tauri build`.

View File

@@ -48,6 +48,7 @@
"vscode-builtin-typescript-language-features": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/typescript-language-features-1.39.1-prel.vsix"
},
"resolutions": {
"@theia/application-package": "./theia-application-package-custom.tgz"
"@theia/application-package": "./theia-application-package-custom.tgz",
"vscode-ripgrep": "./vscode-ripgrep-custom.tgz"
}
}

View File

@@ -40,6 +40,7 @@ fn spawn_theia_server<T: 'static>(handle: &Handle<T>) {
// Get stdout from binary
let stdout = Command::new(orchestrator_binary)
.args(vec!["run", theia_binary.as_str()])
.env("VSCODE_RIPGREP_PATH", get_bin_command("rg"))
.stdout(Stdio::piped())
.spawn()
.expect("Failed to start theia server")

View File

@@ -22,7 +22,11 @@
"icons/icon.ico"
],
"resources": [],
"externalBin": ["theia-binaries/theia", "theia-orchestrators/theia-orchestrator"],
"externalBin": [
"theia-binaries/theia",
"theia-binaries/rg",
"theia-orchestrators/theia-orchestrator"
],
"copyright": "",
"category": "DeveloperTool",
"shortDescription": "",

BIN
vscode-ripgrep-custom.tgz Normal file

Binary file not shown.

View File

@@ -12944,10 +12944,9 @@ vscode-nls@^4.1.1, vscode-nls@^4.1.2:
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
vscode-ripgrep@^1.2.4:
vscode-ripgrep@./vscode-ripgrep-custom.tgz, vscode-ripgrep@^1.2.4:
version "1.5.8"
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.8.tgz#32cb33da6d1a9ca8f5de8c2813ed5114fd55fc11"
integrity sha512-l6Pv/t1Jk63RU+kEkMO04XxnNRYdyzuesizj9AzFpcfrUxxpAjEJBK1qO9Mov30UUGZl7uDUBn+uCv9koaHPPA==
resolved "./vscode-ripgrep-custom.tgz#cd41b803aa23ce119f500510c53c48f54611d648"
vscode-textmate@^4.0.1:
version "4.4.0"