Skip to content

Commit 1515f4c

Browse files
committed
Added better deployment
Fixes #45
1 parent 6571f09 commit 1515f4c

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

bin/deploy.sh

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,30 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true
77

88
source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
99

10-
#######################################
11-
## Checks
12-
#######################################
13-
14-
sectionHeader "Checking TYPO3 installation ..."
15-
16-
if [ ! -d "$CODE_DIR/fileadmin" -o ! -d "$CODE_DIR/typo3conf/ext/" ]; then
17-
errorMsg "Either $CODE_DIR/fileadmin or $CODE_DIR/typo3conf/ext/ doesn't exists"
18-
exit 1
19-
fi
10+
function excludeFilter {
11+
cat | grep -v -E -e '(/typo3/|/typo3_src|/fileadmin/|/typo3temp/|/uploads/|/Packages/|/Data/|/vendor/)'
12+
}
2013

2114
#######################################
2215
## Composer
2316
#######################################
2417

2518
sectionHeader "Checking for composer.json ..."
2619

27-
if [ -f "$CODE_DIR/composer.json" ]; then
28-
# Install composer
29-
execInDir "$CODE_DIR" "composer install --no-dev --no-interaction"
30-
fi
20+
find "$CODE_DIR" -type f -name 'composer.json' | excludeFilter | while read FILE; do
21+
COMPOSER_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
22+
23+
execInDir "$COMPOSER_JSON_DIR" "composer install --no-dev --no-interaction"
24+
done
25+
3126

3227
#######################################
3328
## Bower
3429
#######################################
3530

3631
sectionHeader "Checking for bower.json ..."
3732

38-
find "$CODE_DIR/fileadmin" "$CODE_DIR/typo3conf/ext/" -type f -name 'bower.json' | while read FILE; do
33+
find "$CODE_DIR" -type f -name 'bower.json' | excludeFilter | while read FILE; do
3934
BOWER_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
4035

4136
execInDir "$BOWER_JSON_DIR" "bower install --silent"
@@ -48,7 +43,7 @@ done
4843

4944
sectionHeader "Checking for package.json (npm) ..."
5045

51-
find "$CODE_DIR/fileadmin" "$CODE_DIR/typo3conf/ext/" -type f -name 'package.json' | while read FILE; do
46+
find "$CODE_DIR" -type f -name 'package.json' | excludeFilter | while read FILE; do
5247
PACKAGE_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
5348

5449
if [ ! -d "$PACKAGE_JSON_DIR/node_modules/" -a -n "`which npm-cache`" ]; then
@@ -66,6 +61,8 @@ done
6661

6762
sectionHeader "Checking for gulpfile.js in T3 Root ..."
6863

69-
if [ -f "$CODE_DIR\gulpfile.js" ]; then
70-
execInDir "$CODE_DIR" "gulp deploy"
71-
fi
64+
find "$CODE_DIR" -type f -name 'package.json' | excludeFilter | while read FILE; do
65+
GULPFILE_DIR=$(dirname $($READLINK -f "$FILE"))
66+
67+
execInDir "$GULPFILE_DIR" "gulp deploy"
68+
done

0 commit comments

Comments
 (0)