Address issues from code review.

README.md

@@ -37,35 +37,30 @@ aws s3 cp <s3-url> ~/aws-cdk.zip
 
 ### Install to ~/.cdk
 
-Once you've downloaded the bits, install them into `~/.cdk`:
+Once you've downloaded the bits, install them into `~/.cdk` and make sure that `~/.cdk/bin` is in your `PATH`:
 
 #### Linux/MacOS (Shell)
 
 ```shell
+# Install to ~/.cdk
 rm -fr ~/.cdk
 mkdir ~/.cdk
 unzip <path-to-zip-file> -d ~/.cdk
+
+# Add ~/.cdk/bin to your PATH
+echo 'PATH=$PATH:$HOME/.cdk/bin' >> ~/.bashrc
+echo 'PATH=$PATH:$HOME/.cdk/bin' >> ~/.zshrc
 ```
 
 #### Windows (PowerShell)
+
 ```powershell
+# Install to ~/.cdk
 Remove-Item -Force -Recurse ~/.cdk
 New-Item -Type Directory ~/.cdk
 Expand-Archive -Path <path-to-zip-file> -DestinationPath ~/.cdk
-```
-
-Make sure the `~/.cdk/bin` is in your `PATH`
-
-#### Linux/MacOS (Shell)
 
-```shell
-# at the end of your ~/.bashrc or ~/.zshrc file
-export PATH=$PATH:$HOME/.cdk/bin
-```
-
-#### Windows (PowerShell)
-
-```powershell
+# Add ~/.cdk/bin to your PATH
 $profilePath = Join-Path ([Environment]::GetFolderPath([Environment+SpecialFolder]::MyDocuments)) "Profile.ps1"
 Add-Content -Path $profilePath -Value '$env:Path = "$env:Path;$env:UserProfile\.cdk\bin"'
 ```

bundle-beta.sh

@@ -41,7 +41,7 @@ echo "Installing y-npm" # using y-npm, we're so META!
 ${Y_NPM} install --global-style --no-save y-npm
 # Because y-npm is installed on the build server, we need to bootstrap
 # it on windows by manually creating the shim batch file.
-cp ${root}/tools/y-npm/bin/.y-npm.cmd node_modules/.bin/y-npm.cmd
+cp ${root}/tools/y-npm/bin/y-npm.template.cmd node_modules/.bin/y-npm.cmd
 ln -s node_modules/.bin bin
 
 # Create a local maven repository

packages/aws-cdk/lib/init-templates/app/typescript/package.template.json

@@ -7,7 +7,7 @@
         "%name%": "bin/%name%.js"
     },
     "scripts": {
-        "prepare": "node scripts/prepare.js",
+        "prepare": "tsc",
         "watch": "tsc -w",
         "cdk": "cdk"
     },

packages/aws-cdk/lib/init.ts

@@ -201,7 +201,6 @@ async function postInstall(language: string) {
 }
 
 async function postInstallTypescript() {
-
     const yNpm = os.platform() === 'win32' ?
         path.join(CDK_HOME, 'node_modules', '.bin', 'y-npm.cmd') :
         path.join(CDK_HOME, 'bin', 'y-npm');

tools/y-npm/bin/.y-npm.cmd → tools/y-npm/bin/y-npm.template.cmd

@@ -3,5 +3,5 @@
 ) ELSE (
   @SETLOCAL
   @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\y-npm\bin\y-npm" %*
+  node "%~dp0\..\y-npm\bin\y-npm" %*
 )

tools/y-npm/lib/run-npm-command.ts

@@ -80,6 +80,8 @@ export function runCommand(command: string, args: string[], additionalEnv?: Node
                     env[key] = value;
                 }
             }
+            // `shell: true` is required because on Windows, batch files must be run from a shell, and y-npm
+            // is invoked using the batch file y-npm.cmd (to work around symlink issues on Windows).
             const child = spawn(command, args, { detached: false, env, shell: true, stdio: ['inherit', 'pipe', 'pipe'] });
             debug(`Command PID: ${child.pid}`);
             const stdout = new Array<Buffer>();