Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
provision
Commits
c96b2f96
Commit
c96b2f96
authored
Oct 23, 2009
by
Adrian Rossouw
Committed by
adrian
Oct 23, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring in line with Drush upstream. Aegir now requires Drush HEAD
parent
c74e3a2c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
platform/drupal/packages.inc
platform/drupal/packages.inc
+2
-2
platform/drupal/packages_5.inc
platform/drupal/packages_5.inc
+3
-3
platform/drupal/packages_7.inc
platform/drupal/packages_7.inc
+2
-2
platform/provision_drupal.drush.inc
platform/provision_drupal.drush.inc
+3
-3
No files found.
platform/drupal/packages.inc
View file @
c96b2f96
...
...
@@ -16,8 +16,8 @@ function _provision_drupal_find_themes($scope, $key = '') {
$files
=
array
();
$engines
=
array
();
foreach
(
$paths
as
$path
)
{
$files
=
array_merge
(
$files
,
drush_scan_directory
(
$path
,
".info$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$engines
=
array_merge
(
$engines
,
drush_scan_directory
(
$path
.
"/engines"
,
".engine$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$files
=
array_merge
(
$files
,
drush_scan_directory
(
$path
,
"
/\
.info$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$engines
=
array_merge
(
$engines
,
drush_scan_directory
(
$path
.
"/engines"
,
"
/\
.engine$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
}
foreach
(
$files
as
$name
=>
$file
)
{
$files
[
$name
]
->
info
=
_provision_drupal_parse_info_file
(
$file
->
filename
);
...
...
platform/drupal/packages_5.inc
View file @
c96b2f96
...
...
@@ -22,8 +22,8 @@ function _provision_drupal_find_themes($scope, $key = '') {
$themes
=
array
();
$templates
=
array
();
foreach
(
$paths
as
$path
)
{
$themes
=
array_merge
(
$themes
,
drush_scan_directory
(
$path
,
".theme$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$templates
=
array_merge
(
$templates
,
drush_scan_directory
(
$path
,
"page.tpl.php$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'filename'
));
$themes
=
array_merge
(
$themes
,
drush_scan_directory
(
$path
,
"
/\
.theme$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$templates
=
array_merge
(
$templates
,
drush_scan_directory
(
$path
,
"
/
page.tpl.php$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'filename'
));
}
foreach
(
$themes
as
$name
=>
$file
)
{
...
...
@@ -38,7 +38,7 @@ function _provision_drupal_find_themes($scope, $key = '') {
}
foreach
(
$files
as
$name
=>
$theme
)
{
// Now that we have the themes, let's get the sub styles.
foreach
(
drush_scan_directory
(
dirname
(
$theme
->
filename
),
'style.css$'
)
as
$style
)
{
foreach
(
drush_scan_directory
(
dirname
(
$theme
->
filename
),
'
/
style.css$
/
'
)
as
$style
)
{
$style
->
style
=
TRUE
;
$style
->
template
=
isset
(
$theme
->
template
)
?
$theme
->
template
:
FALSE
;
$style
->
name
=
basename
(
dirname
(
$style
->
filename
));
...
...
platform/drupal/packages_7.inc
View file @
c96b2f96
...
...
@@ -17,8 +17,8 @@ function _provision_drupal_find_themes($scope, $key = '') {
$files
=
array
();
$engines
=
array
();
foreach
(
$paths
as
$path
)
{
$files
=
array_merge
(
$files
,
drush_scan_directory
(
$path
,
".info$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$engines
=
array_merge
(
$engines
,
drush_scan_directory
(
$path
.
"/engines"
,
".engine$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$files
=
array_merge
(
$files
,
drush_scan_directory
(
$path
,
"
/\
.info$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$engines
=
array_merge
(
$engines
,
drush_scan_directory
(
$path
.
"/engines"
,
"
/\
.engine$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
}
foreach
(
$files
as
$name
=>
$file
)
{
$files
[
$name
]
->
info
=
_provision_drupal_parse_info_file
(
$file
->
filename
);
...
...
platform/provision_drupal.drush.inc
View file @
c96b2f96
...
...
@@ -300,8 +300,8 @@ function _provision_find_profiles() {
$languages
[
'en'
]
=
1
;
// Find languages available
$files
=
array_keys
(
drush_scan_directory
(
'./profiles/'
.
$name
.
'/translations'
,
'\.po$'
,
array
(
'.'
,
'..'
,
'CVS'
),
0
,
FALSE
,
'filepath'
));
$files
=
array_merge
(
$files
,
array_keys
(
drush_scan_directory
(
'./profiles/'
.
$name
,
'\.po$'
,
array
(
'.'
,
'..'
,
'CVS'
),
0
,
FALSE
,
'filepath'
)));
$files
=
array_keys
(
drush_scan_directory
(
'./profiles/'
.
$name
.
'/translations'
,
'
/
\.po$
/
'
,
array
(
'.'
,
'..'
,
'CVS'
),
0
,
FALSE
,
'filepath'
));
$files
=
array_merge
(
$files
,
array_keys
(
drush_scan_directory
(
'./profiles/'
.
$name
,
'
/
\.po$
/
'
,
array
(
'.'
,
'..'
,
'CVS'
),
0
,
FALSE
,
'filepath'
)));
if
(
is_array
(
$files
))
{
foreach
(
$files
as
$file
)
{
if
(
preg_match
(
'!(/|\.)([^\./]+)\.po$!'
,
$file
,
$langcode
))
{
...
...
@@ -535,7 +535,7 @@ function _provision_drupal_find_modules($scope, $key = '') {
$paths
=
_provision_drupal_search_paths
(
$scope
,
$key
,
'modules'
);
$files
=
array
();
foreach
(
$paths
as
$path
)
{
$files
=
array_merge
(
$files
,
drush_scan_directory
(
$path
,
".module$"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
$files
=
array_merge
(
$files
,
drush_scan_directory
(
$path
,
"
/
.module$
/
"
,
array
(
'.'
,
'..'
,
'CVS'
,
'.svn'
),
0
,
true
,
'name'
));
}
foreach
(
$files
as
$name
=>
$info
)
{
$install_file
=
sprintf
(
"%s/%s.install"
,
dirname
(
$info
->
filename
),
$name
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment