diff --git a/tools/files.js b/tools/files.js index 8d6a9aed7f..1950bc6773 100644 --- a/tools/files.js +++ b/tools/files.js @@ -1161,7 +1161,11 @@ _.extend(files.KeyValueFile.prototype, { files.getHomeDir = function () { if (process.platform === "win32") { - var homeDir = process.env.LOCALAPPDATA || process.env.APPDATA; + var homeDir = + process.env.METEOR_INSTALLATION || + process.env.LOCALAPPDATA || + process.env.APPDATA; + return files.convertToStandardPath(homeDir); } @@ -1185,6 +1189,13 @@ files._generateScriptLinkToMeteorScript = function (scriptLocation) { var newScript = [ "@echo off", + // set the installation path to the grand-parent folder of this script + "set DOT_METEOR=\"%~dp0%\"", + "pushd %DOT_METEOR%", + "cd ..", + "set METEOR_INSTALLATION=\"%cd%\"", + "popd", + // always convert to Windows path since this function can also be // called on Linux or Mac when we are building bootstrap tarballs "\"" + scriptLocationConverted + "\" %*",