Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Copy hidden files at top level directory #2

Merged
merged 1 commit into from

2 participants

@jfarrell

Hidden files ignored at top level directory due to * vs . passed to
cp command.

Patch by @wallyqs and @JeanSebTr via github pull requests
which got closed and never brought back in.

@jfarrell jfarrell Copy hidden files at top level directory
Hidden files ignored at top level directory due to * vs . passed to
cp command.

Patch by @wallyqs and @JeanSebTr via github pull requests
which got closed and never brought back in.
9342664
@jencompgeek jencompgeek referenced this pull request from a commit
Jennifer Hickey and Maria Shaldibina Bump java buildpack
git shortlog c26eb3f..1e98b91
Glyn Normington (2):
      add invalid JDK example; ensure .jdk directory is cleaned up
      switch to RSpec 2 syntax

Jennifer Hickey (1):
      Upgrade to Tomcat 7

jencompgeek (1):
      Merge pull request #2 from glyn/test-invalid-jdk
bb2eeed
@cf-frameworks cf-frameworks merged commit 9342664 into cloudfoundry-attic:master
@cf-frameworks

Staging plugin was moved to dea_ng, could you make same change there? https://github.com/cloudfoundry/dea_ng/blob/master/buildpacks/lib/staging_plugin.rb

thanks,
Maria

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 14, 2013
  1. @jfarrell

    Copy hidden files at top level directory

    jfarrell authored
    Hidden files ignored at top level directory due to * vs . passed to
    cp command.
    
    Patch by @wallyqs and @JeanSebTr via github pull requests
    which got closed and never brought back in.
This page is out of date. Refresh to see the latest.
View
2  lib/vcap/staging/plugin/play/plugin.rb
@@ -31,7 +31,7 @@ def copy_source_files(dest = nil)
dest ||= File.join(@destination_directory, 'app')
# Play dists unpack to a dir named for app. Assume that is the only entry
app_dir = File.join(@source_directory,Dir.glob("*").first)
- system "cp -a #{File.join(app_dir, "*")} #{dest}"
+ system "cp -a #{File.join(app_dir, ".")} #{dest}"
end
end
View
2  lib/vcap/staging/plugin/staging_plugin.rb
@@ -293,7 +293,7 @@ def create_startup_script
def copy_source_files(dest = nil)
dest ||= app_dir
- system "cp -a #{File.join(source_directory, "*")} #{dest}"
+ system "cp -a #{File.join(source_directory, ".")} #{dest}"
end
def detection_rules
View
4 spec/fixtures/apps/phpinfo/source/.htaccess
@@ -0,0 +1,4 @@
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteRule ^oldpage\.html$ newpage.html
+</IfModule>
View
8 spec/unit/php_spec.rb
@@ -47,6 +47,14 @@
EXPECTED
end
end
+
+ it "is packaged without missing dot files like .htaccess" do
+ stage(php_staging_env({:memory => 256})) do |staged_dir|
+ app_dir = File.join(staged_dir, 'app')
+ app_files = Dir.entries(app_dir)
+ app_files.should include('.htaccess')
+ end
+ end
end
def php_staging_env(resources={})
Something went wrong with that request. Please try again.