Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz

2016-04-05 23:38:03 +02:00
parent dddabe7724 9fe7e04e2f
commit b46c99efc4
1 changed files with 9 additions and 2 deletions
@@ -31,8 +31,15 @@ fi
 git checkout $BRANCH
 git pull origin $BRANCH

+if [ ! $? -eq 0 ]; then
+	echo " *****************************"
+	echo " * ERROR: cannot do git pull *"
+	echo " *****************************"
+	exit 2
+fi
+
 php artisan migrate
-php artisan vendor:publish --tag=module-views --force
-php artisan vendor:publish --tag=public-assets --force
+php artisan vendor:publish --tag=module-views --force -n
+php artisan vendor:publish --tag=public-assets --force -n

 composer install --no-dev