In 'meteor --version', print the git sha of the checkout used at inst…

…all time.

app/lib/updater.js

@@ -5,6 +5,8 @@ var https = require("https");
 var path = require("path");
 var semver = require("semver");
 
+var files = require("./files.js")
+
 var manifest_options = {
   host: 's3.amazonaws.com',
   path: '/com.meteor.static/update/manifest.json'
@@ -55,3 +57,19 @@ exports.needs_upgrade = function (version) {
 
   return semver.lt(exports.CURRENT_VERSION, version);
 };
+
+
+exports.git_sha = function () {
+  var d = files.get_dev_bundle();
+  var f = path.join(d, ".git_version.txt");
+
+  if (path.existsSync(f)) {
+    try {
+      var contents = fs.readFileSync(f, 'utf8');
+      contents = contents.replace(/\s+$/, "");
+      return contents;
+    } catch (err) { }
+  }
+
+  return null;
+};

app/meteor/meteor.js

@@ -549,7 +549,16 @@ var main = function() {
 
   if (argv.version) {
     var updater = require('../lib/updater.js');
-    process.stdout.write("Meteor version " + updater.CURRENT_VERSION + "\n");
+    var sha = updater.git_sha();
+
+    process.stdout.write("Meteor version " + updater.CURRENT_VERSION);
+
+    if (files.in_checkout())
+      process.stdout.write(" (git checkout)");
+    else if (sha)
+      process.stdout.write(" (" + sha.substr(0, 10) + ")");
+
+    process.stdout.write("\n");
     process.exit(0);
   }
 

install.sh

@@ -37,3 +37,6 @@ CPR packages "$TARGET_DIR"
 mkdir -p "$PARENT/bin"
 rm -f "$PARENT/bin/meteor"
 ln -s "$TARGET_DIR/bin/meteor" "$PARENT/bin/meteor"
+
+# mark directory with current git sha
+git rev-parse HEAD > "$TARGET_DIR/.git_version.txt"