From 3254caceefda268247826cd9bb8178725a9f0b08 Mon Sep 17 00:00:00 2001
From: Nathan Rajlich <nathan@tootallnate.net>
Date: Sat, 4 Aug 2012 00:12:52 -0700
Subject: [PATCH] install: use os.path.join() to create the npm shebang

Prettier formatting for the shebang if the "prefix" ends with a /
---
 tools/install.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/install.py b/tools/install.py
index 2ee9903..988626f 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -128,7 +128,7 @@ def waf_files(action):
           'lib/node/wafadmin/')
 
 def update_shebang(path, shebang):
-  print 'updating shebang of %s' % path
+  print 'updating shebang of %s to %s' % (path, shebang)
   s = open(path, 'r').read()
   s = re.sub(r'#!.*\n', '#!' + shebang + '\n', s)
   open(path, 'w').write(s)
@@ -153,7 +153,8 @@ def npm_files(action):
     action([link_path], 'bin/npm')
   elif action == install:
     try_symlink('../lib/node_modules/npm/bin/npm-cli.js', link_path)
-    update_shebang(link_path, node_prefix + '/bin/node')
+    shebang = os.path.join(node_prefix, 'bin/node')
+    update_shebang(link_path, shebang)
   else:
     assert(0) # unhandled action type
 
-- 
2.7.4