fix install correctly bin

LeoIannacone · Jun 4, 2014 · 71c0701 · 71c0701
1 parent 61070b2
commit 71c0701
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/npm2deb/__init__.py b/npm2deb/__init__.py
@@ -145,10 +145,11 @@ def create_dirs(self):
     def create_links(self):
         links = []
         dest = self.debian_dest
-        if os.path.isdir('bin'):
-            for script in os.listdir('bin'):
-                links.append("%s/bin/%s usr/bin/%s" %
-                            (dest, script, script.replace('.js', '')))
+        if 'bin' in self.json:
+            for script in self.json['bin']:
+                orig = os.path.normpath(self.json['bin'][script])
+                links.append("%s/%s usr/bin/%s" %
+                            (dest, orig, script))
         if len(links) > 0:
             content = '\n'.join(links)
             utils.create_debian_file('links', content)

diff --git a/tests/npm_coherence.py b/tests/npm_coherence.py
@@ -128,6 +128,13 @@ def test_watch_github_with_no_tags(self):
         line = self._get_debfile_line('watch', '/fakeupstream')
         self.assertTrue(line is not None and len(line) > 0)
 
+    def test_install_bin(self):
+        n = Npm2Deb('mocha')
+        n.create_base_debian()
+        n.create_links()
+        line = self._get_debfile_line('links', 'mocha')
+        self.assertTrue(line == 'usr/lib/nodejs/mocha/bin/mocha usr/bin/mocha')
+
 
 if __name__ == '__main__':
     unittest.main()