app.rb in appbundler-0.12.5

- old
+ new

@@ -17,12 +17,12 @@
     attr_reader :bundle_path
     attr_reader :target_bin_dir
     attr_reader :name
     attr_reader :extra_bin_files
 
-    # The bundle_path is always the path to the Gemfile.lock being used, e.g.
-    # /var/cache/omnibus/src/chef/chef-14.10.9/Gemfile.lock or whatever.  If
+    # The bundle_path is always the path to the directory containing the Gemfile.lock
+    # being used, e.g.  /var/cache/omnibus/src/chef/chefor whatever.  If
     # the name if the gem is not set then we behave like old style 2-arg appbundling
     # where the gem we are appbundling is in the gemspec in that directory.
     #
     # If the name is not nil, then we are doing a multiple-app appbundle where
     # the Gemfile.lock is the omnibus Gemfile.lock and multiple app gems may be
@@ -140,10 +140,10 @@
     # binstub location.
     #
     def copy_binstubs(binstubs_source)
       gem_path = installed_spec.gem_dir
       dst = "#{gem_path}/bin"
-      src = "#{gem_path}/#{binstubs_source}/*"
+      src = File.join(bundle_path, binstubs_source, "*")
       FileUtils.cp_r(Dir.glob(src), dst)
     end
 
     # This is the implementation of the 3-arg version of writing the merged lockfiles,
     # when called with the 2-arg version it short-circuits, however, to the copy_bundler_env