Skip to content

Commit ce12915

Browse files
committed
Merge install-run-common into install-run
1 parent fb2ec44 commit ce12915

File tree

7 files changed

+629
-623
lines changed

7 files changed

+629
-623
lines changed

apps/rush-lib/src/logic/StandardScriptUpdater.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { RushConfiguration } from '../api/RushConfiguration';
1212
* This is used by the "rush install" and "rush update" commands.
1313
*/
1414
export class StandardScriptUpdater {
15-
private static readonly _scriptNames: string[] = [ 'install-run.js', 'install-run-rush.js', 'install-run-common.js' ];
15+
private static readonly _scriptNames: string[] = [ 'install-run.js', 'install-run-rush.js' ];
1616

1717
/**
1818
* Recopy the scripts if the scripts are out of date.

apps/rush-lib/src/scripts/install-run-common.ts

Lines changed: 0 additions & 309 deletions
This file was deleted.

apps/rush-lib/src/scripts/install-run-rush.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
findRushJsonFolder,
1919
RUSH_JSON_FILENAME,
2020
runWithErrorAndStatusCode
21-
} from './install-run-common';
21+
} from './install-run';
2222

2323
const PACKAGE_NAME: string = '@microsoft/rush';
2424

@@ -41,19 +41,19 @@ function getRushVersion(): string {
4141
}
4242

4343
function run(): void {
44+
const [
45+
nodePath, /* Ex: /bin/node */ // tslint:disable-line:no-unused-variable
46+
scriptPath, /* /repo/common/scripts/install-run-rush.js */ // tslint:disable-line:no-unused-variable
47+
...packageBinArgs /* [build, --to, myproject] */
48+
]: string[] = process.argv;
49+
4450
if (process.argv.length < 3) {
4551
console.log('Usage: install-run-rush.js <command> [args...]');
4652
console.log('Example: install-run-rush.js build --to myproject');
4753
process.exit(1);
4854
}
4955

5056
runWithErrorAndStatusCode(() => {
51-
const [
52-
nodePath, /* Ex: /bin/node */ // tslint:disable-line:no-unused-variable
53-
scriptPath, /* /repo/common/scripts/install-run-rush.js */ // tslint:disable-line:no-unused-variable
54-
...packageBinArgs /* [build, --to, myproject] */
55-
]: string[] = process.argv;
56-
5757
const version: string = getRushVersion();
5858
console.log(`The rush.json configuration requests Rush version ${version}`);
5959

0 commit comments

Comments
 (0)