Skip to content

Commit 1d3b358

Browse files
committed
--slave to --no-echo
1 parent 47f6ed6 commit 1d3b358

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

src/helpViewer/helpPreviewer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export class RLocalHelpPreviewer {
239239
// Convert .Rd to HTML
240240
const args = [
241241
'--silent',
242-
'--slave',
242+
'--no-echo',
243243
'--no-save',
244244
'--no-restore',
245245
'-f',

src/helpViewer/helpProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class HelpProvider {
4949
const scriptPath = extensionContext.asAbsolutePath('R/help/helpServer.R');
5050
const args = [
5151
'--silent',
52-
'--slave',
52+
'--no-echo',
5353
'--no-save',
5454
'--no-restore',
5555
'-e',
@@ -259,7 +259,7 @@ export class AliasProvider {
259259

260260
const args = [
261261
'--silent',
262-
'--slave',
262+
'--no-echo',
263263
'--no-save',
264264
'--no-restore',
265265
'-f',

src/helpViewer/packages.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export class PackageManager {
193193
// remove a specified package. The packagename is selected e.g. in the help tree-view
194194
public async removePackage(pkgName: string): Promise<boolean> {
195195
const rPath = this.rHelp.rPath;
196-
const args = ['--silent', '--slave', '--no-save', '--no-restore', '-e', `remove.packages('${pkgName}')`];
196+
const args = ['--silent', '--no-echo', '--no-save', '--no-restore', '-e', `remove.packages('${pkgName}')`];
197197
const cmd = `${rPath} ${args.join(' ')}`;
198198
const confirmation = 'Yes, remove package!';
199199
const prompt = `Are you sure you want to remove package ${pkgName}?`;
@@ -211,7 +211,7 @@ export class PackageManager {
211211
public async installPackages(pkgNames: string[], skipConfirmation: boolean = false): Promise<boolean> {
212212
const rPath = this.rHelp.rPath;
213213
const cranUrl = await getCranUrl('', this.cwd);
214-
const args = [`--silent`, '--slave', `-e`, `install.packages(c(${pkgNames.map(v => `'${v}'`).join(',')}),repos='${cranUrl}')`];
214+
const args = [`--silent`, '--no-echo', `-e`, `install.packages(c(${pkgNames.map(v => `'${v}'`).join(',')}),repos='${cranUrl}')`];
215215
const cmd = `${rPath} ${args.join(' ')}`;
216216
const pluralS = pkgNames.length > 1? 's' : '';
217217
const confirmation = `Yes, install package${pluralS}!`;
@@ -227,7 +227,7 @@ export class PackageManager {
227227
public async updatePackages(skipConfirmation: boolean = false): Promise<boolean> {
228228
const rPath = this.rHelp.rPath;
229229
const cranUrl = await getCranUrl('', this.cwd);
230-
const args = ['--silent', '--slave', '--no-save', '--no-restore', '-e', `update.packages(ask=FALSE,repos='${cranUrl}')`];
230+
const args = ['--silent', '--no-echo', '--no-save', '--no-restore', '-e', `update.packages(ask=FALSE,repos='${cranUrl}')`];
231231
const cmd = `${rPath} ${args.join(' ')}`;
232232
const confirmation = 'Yes, update all packages!';
233233
const prompt = 'Are you sure you want to update all installed packages? This might take some time!';

src/languageService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class LanguageService implements Disposable {
8686
const options = { cwd: cwd, env: env };
8787
const args = (config.get<string[]>('lsp.args')?.map(substituteVariables) ?? []).concat(
8888
'--silent',
89-
'--slave',
89+
'--no-echo',
9090
'--no-save',
9191
'--no-restore',
9292
'-e',

src/rmarkdown/draft.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async function getTemplateItems(cwd: string): Promise<TemplateItem[] | undefined
3535
const rScriptFile = extensionContext.asAbsolutePath('R/rmarkdown/templates.R');
3636
const args = [
3737
'--silent',
38-
'--slave',
38+
'--no-echo',
3939
'--no-save',
4040
'--no-restore',
4141
'-f',

src/rmarkdown/manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ export abstract class RMarkdownManager {
6565
const scriptArgs = args.scriptArgs;
6666
const scriptPath = args.scriptPath;
6767
const fileName = args.fileName;
68-
// const cmd = `${this.rPath} --silent --slave --no-save --no-restore -f "${scriptPath}"`;
68+
// const cmd = `${this.rPath} --silent --no-echo --no-save --no-restore -f "${scriptPath}"`;
6969
const cpArgs = [
7070
'--silent',
71-
'--slave',
71+
'--no-echo',
7272
'--no-save',
7373
'--no-restore',
7474
'-f',

src/util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ export async function executeRCommand(rCommand: string, cwd?: string | URL, fall
352352
const lim = '---vsc---';
353353
const args = [
354354
'--silent',
355-
'--slave',
355+
'--no-echo',
356356
'--no-save',
357357
'--no-restore',
358358
'-e', `cat('${lim}')`,
@@ -555,7 +555,7 @@ export async function promptToInstallRPackage(name: string, section: string, cwd
555555
void vscode.window.showErrorMessage('R path not set', 'OK');
556556
return;
557557
}
558-
const args = ['--silent', '--slave', '--no-save', '--no-restore', '-e', `install.packages('${name}', repos='${repo}')`];
558+
const args = ['--silent', '--no-echo', '--no-save', '--no-restore', '-e', `install.packages('${name}', repos='${repo}')`];
559559
void executeAsTask('Install Package', rPath, args, true);
560560
if (postInstallMsg) {
561561
void vscode.window.showInformationMessage(postInstallMsg, 'OK');

0 commit comments

Comments
 (0)