From c125ba0d6656d88323368183c3d8f6a6b972a726 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Sep 2015 15:40:17 +0200
Subject: [PATCH] Update ignore to secure
Conflicts:
htdocs/.gitignore
---
build/makepack-dolibarr.pl | 3 ++-
htdocs/.gitignore | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index a4dbb40ae7c..18e7092fc1b 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -457,6 +457,7 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
# Removed known external modules to avoir any error when packaging on test env
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`; # For custom we want to keep dir
+ $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
@@ -470,8 +471,8 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
- # Removed other test files
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
+ # Removed other test files
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index 160eae6f858..4b12a493530 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -11,3 +11,6 @@
/teclib*
/test.php
/ultimatepdf*
+/lead
+/dolimed*
+/allscreens*
\ No newline at end of file
--
GitLab