From 96a3742945cb468d8906d4435cd868c4d718c139 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 17 Apr 2014 17:49:15 +0200 Subject: [PATCH] rename /install dir --- .travis.yml | 2 +- core/lib/Thelia/Install/Database.php | 4 ++-- core/lib/Thelia/Install/Update.php | 4 ++-- reset_install.bat | 6 +++--- reset_install.sh | 6 +++--- run_casperjs.sh | 4 ++-- {install => setup}/.gitkeep | 0 {install => setup}/.htaccess | 0 {install => setup}/INSTALL-TODO.txt | 0 {install => setup}/faker-assets/FreeSans.ttf | Bin {install => setup}/faker.php | 0 .../faker_100categories_1000products_4locales.php | 0 {install => setup}/faker_add_ecotax.php | 0 {install => setup}/import.php | 10 +++++----- {install => setup}/import/brand.csv | 0 {install => setup}/import/categories.csv | 0 {install => setup}/import/colors.csv | 0 {install => setup}/import/images/PROD001-1.jpg | Bin {install => setup}/import/images/PROD001-2.jpg | Bin {install => setup}/import/images/PROD001-3.jpg | Bin {install => setup}/import/images/PROD001-4.jpg | Bin {install => setup}/import/images/PROD001-5.jpg | Bin {install => setup}/import/images/PROD002-1.jpg | Bin {install => setup}/import/images/PROD002-2.jpg | Bin {install => setup}/import/images/PROD002-3.jpg | Bin {install => setup}/import/images/PROD002-4.jpg | Bin {install => setup}/import/images/PROD002-5.jpg | Bin {install => setup}/import/images/PROD002-6.jpg | Bin {install => setup}/import/images/PROD003-1.jpg | Bin {install => setup}/import/images/PROD003-2.jpg | Bin {install => setup}/import/images/PROD003-3.jpg | Bin {install => setup}/import/images/PROD004-1.jpg | Bin {install => setup}/import/images/PROD004-2.jpg | Bin {install => setup}/import/images/PROD005-1.jpg | Bin {install => setup}/import/images/PROD005-2.jpg | Bin {install => setup}/import/images/PROD005-3.jpg | Bin {install => setup}/import/images/PROD005-4.jpg | Bin {install => setup}/import/images/PROD005-5.jpg | Bin {install => setup}/import/images/PROD005-6.jpg | Bin {install => setup}/import/images/PROD006-1.jpg | Bin {install => setup}/import/images/PROD006-2.jpg | Bin {install => setup}/import/images/PROD006-3.jpg | Bin {install => setup}/import/images/PROD006-4.jpg | Bin {install => setup}/import/images/PROD006-5.jpg | Bin {install => setup}/import/images/PROD006-6.jpg | Bin {install => setup}/import/images/PROD007-1.jpg | Bin {install => setup}/import/images/PROD007-2.jpg | Bin {install => setup}/import/images/PROD007-3.jpg | Bin {install => setup}/import/images/PROD007-4.jpg | Bin {install => setup}/import/images/PROD008-1.jpg | Bin {install => setup}/import/images/PROD008-2.jpg | Bin {install => setup}/import/images/PROD008-3.jpg | Bin {install => setup}/import/images/PROD008-4.jpg | Bin {install => setup}/import/images/PROD008-5.jpg | Bin {install => setup}/import/images/PROD009-1.jpg | Bin {install => setup}/import/images/PROD009-2.jpg | Bin {install => setup}/import/images/PROD009-3.jpg | Bin {install => setup}/import/images/PROD010-1.jpg | Bin {install => setup}/import/images/PROD010-2.jpg | Bin {install => setup}/import/images/PROD010-3.jpg | Bin {install => setup}/import/images/PROD010-4.jpg | Bin {install => setup}/import/images/PROD011-1.jpg | Bin {install => setup}/import/images/PROD011-2.jpg | Bin {install => setup}/import/images/PROD011-3.jpg | Bin {install => setup}/import/images/PROD011-4.jpg | Bin {install => setup}/import/images/PROD012-1.jpg | Bin {install => setup}/import/images/PROD012-2.jpg | Bin {install => setup}/import/images/PROD013-1.jpg | Bin {install => setup}/import/images/PROD014-1.jpg | Bin {install => setup}/import/images/PROD014-2.jpg | Bin {install => setup}/import/images/PROD014-3.jpg | Bin {install => setup}/import/images/PROD014-4.jpg | Bin {install => setup}/import/images/PROD015-1.jpg | Bin {install => setup}/import/images/PROD015-2.jpg | Bin {install => setup}/import/images/PROD016-1.jpg | Bin {install => setup}/import/images/PROD017-1.jpg | Bin {install => setup}/import/images/PROD017-2.jpg | Bin {install => setup}/import/images/PROD017-3.jpg | Bin {install => setup}/import/images/PROD017-4.jpg | Bin {install => setup}/import/images/PROD018-1.jpg | Bin {install => setup}/import/images/PROD019-1.jpg | Bin {install => setup}/import/images/PROD019-2.jpg | Bin {install => setup}/import/images/PROD019-3.jpg | Bin {install => setup}/import/images/PROD019-4.jpg | Bin {install => setup}/import/images/PROD019-5.jpg | Bin {install => setup}/import/images/PROD020-1.jpg | Bin {install => setup}/import/images/PROD021-1.jpg | Bin {install => setup}/import/images/PROD021-2.jpg | Bin {install => setup}/import/images/PROD021-3.jpg | Bin {install => setup}/import/images/PROD021-4.jpg | Bin {install => setup}/import/images/PROD022-1.jpg | Bin {install => setup}/import/images/PROD022-2.jpg | Bin {install => setup}/import/images/PROD022-3.jpg | Bin {install => setup}/import/images/PROD022-4.jpg | Bin {install => setup}/import/images/PROD022-5.jpg | Bin {install => setup}/import/images/PROD023-1.jpg | Bin {install => setup}/import/images/PROD023-2.jpg | Bin {install => setup}/import/images/PROD023-3.jpg | Bin {install => setup}/import/images/PROD023-4.jpg | Bin {install => setup}/import/images/PROD023-5.jpg | Bin {install => setup}/import/images/PROD023-6.jpg | Bin {install => setup}/import/images/PROD024-1.jpg | Bin {install => setup}/import/images/PROD024-2.jpg | Bin {install => setup}/import/images/PROD024-3.jpg | Bin {install => setup}/import/images/PROD024-4.jpg | Bin {install => setup}/import/images/PROD024-5.jpg | Bin {install => setup}/import/images/PROD025-1.jpg | Bin {install => setup}/import/images/PROD025-2.jpg | Bin {install => setup}/import/images/PROD025-3.jpg | Bin {install => setup}/import/images/PROD026-1.jpg | Bin {install => setup}/import/images/PROD027-1.jpg | Bin {install => setup}/import/images/PROD028-1.jpg | Bin {install => setup}/import/images/PROD029-1.jpg | Bin {install => setup}/import/images/PROD030-1.jpg | Bin {install => setup}/import/images/PROD030-2.jpg | Bin {install => setup}/import/images/PROD030-3.jpg | Bin {install => setup}/import/images/PROD030-4.jpg | Bin {install => setup}/import/products.csv | 0 {install => setup}/insert.sql | 0 {install => setup}/tax_faker.php | 0 {install => setup}/thelia.sql | 0 {install => setup}/update/2.0.0-RC1.sql | 0 {install => setup}/update/2.0.0-beta2.sql | 0 {install => setup}/update/2.0.0-beta3.sql | 0 {install => setup}/update/2.0.0-beta4.sql | 0 {install => setup}/update/2.0.0.sql | 0 126 files changed, 18 insertions(+), 18 deletions(-) rename {install => setup}/.gitkeep (100%) rename {install => setup}/.htaccess (100%) rename {install => setup}/INSTALL-TODO.txt (100%) rename {install => setup}/faker-assets/FreeSans.ttf (100%) rename {install => setup}/faker.php (100%) rename {install => setup}/faker_100categories_1000products_4locales.php (100%) rename {install => setup}/faker_add_ecotax.php (100%) rename {install => setup}/import.php (96%) rename {install => setup}/import/brand.csv (100%) rename {install => setup}/import/categories.csv (100%) rename {install => setup}/import/colors.csv (100%) rename {install => setup}/import/images/PROD001-1.jpg (100%) rename {install => setup}/import/images/PROD001-2.jpg (100%) rename {install => setup}/import/images/PROD001-3.jpg (100%) rename {install => setup}/import/images/PROD001-4.jpg (100%) rename {install => setup}/import/images/PROD001-5.jpg (100%) rename {install => setup}/import/images/PROD002-1.jpg (100%) rename {install => setup}/import/images/PROD002-2.jpg (100%) rename {install => setup}/import/images/PROD002-3.jpg (100%) rename {install => setup}/import/images/PROD002-4.jpg (100%) rename {install => setup}/import/images/PROD002-5.jpg (100%) rename {install => setup}/import/images/PROD002-6.jpg (100%) rename {install => setup}/import/images/PROD003-1.jpg (100%) rename {install => setup}/import/images/PROD003-2.jpg (100%) rename {install => setup}/import/images/PROD003-3.jpg (100%) rename {install => setup}/import/images/PROD004-1.jpg (100%) rename {install => setup}/import/images/PROD004-2.jpg (100%) rename {install => setup}/import/images/PROD005-1.jpg (100%) rename {install => setup}/import/images/PROD005-2.jpg (100%) rename {install => setup}/import/images/PROD005-3.jpg (100%) rename {install => setup}/import/images/PROD005-4.jpg (100%) rename {install => setup}/import/images/PROD005-5.jpg (100%) rename {install => setup}/import/images/PROD005-6.jpg (100%) rename {install => setup}/import/images/PROD006-1.jpg (100%) rename {install => setup}/import/images/PROD006-2.jpg (100%) rename {install => setup}/import/images/PROD006-3.jpg (100%) rename {install => setup}/import/images/PROD006-4.jpg (100%) rename {install => setup}/import/images/PROD006-5.jpg (100%) rename {install => setup}/import/images/PROD006-6.jpg (100%) rename {install => setup}/import/images/PROD007-1.jpg (100%) rename {install => setup}/import/images/PROD007-2.jpg (100%) rename {install => setup}/import/images/PROD007-3.jpg (100%) rename {install => setup}/import/images/PROD007-4.jpg (100%) rename {install => setup}/import/images/PROD008-1.jpg (100%) rename {install => setup}/import/images/PROD008-2.jpg (100%) rename {install => setup}/import/images/PROD008-3.jpg (100%) rename {install => setup}/import/images/PROD008-4.jpg (100%) rename {install => setup}/import/images/PROD008-5.jpg (100%) rename {install => setup}/import/images/PROD009-1.jpg (100%) rename {install => setup}/import/images/PROD009-2.jpg (100%) rename {install => setup}/import/images/PROD009-3.jpg (100%) rename {install => setup}/import/images/PROD010-1.jpg (100%) rename {install => setup}/import/images/PROD010-2.jpg (100%) rename {install => setup}/import/images/PROD010-3.jpg (100%) rename {install => setup}/import/images/PROD010-4.jpg (100%) rename {install => setup}/import/images/PROD011-1.jpg (100%) rename {install => setup}/import/images/PROD011-2.jpg (100%) rename {install => setup}/import/images/PROD011-3.jpg (100%) rename {install => setup}/import/images/PROD011-4.jpg (100%) rename {install => setup}/import/images/PROD012-1.jpg (100%) rename {install => setup}/import/images/PROD012-2.jpg (100%) rename {install => setup}/import/images/PROD013-1.jpg (100%) rename {install => setup}/import/images/PROD014-1.jpg (100%) rename {install => setup}/import/images/PROD014-2.jpg (100%) rename {install => setup}/import/images/PROD014-3.jpg (100%) rename {install => setup}/import/images/PROD014-4.jpg (100%) rename {install => setup}/import/images/PROD015-1.jpg (100%) rename {install => setup}/import/images/PROD015-2.jpg (100%) rename {install => setup}/import/images/PROD016-1.jpg (100%) rename {install => setup}/import/images/PROD017-1.jpg (100%) rename {install => setup}/import/images/PROD017-2.jpg (100%) rename {install => setup}/import/images/PROD017-3.jpg (100%) rename {install => setup}/import/images/PROD017-4.jpg (100%) rename {install => setup}/import/images/PROD018-1.jpg (100%) rename {install => setup}/import/images/PROD019-1.jpg (100%) rename {install => setup}/import/images/PROD019-2.jpg (100%) rename {install => setup}/import/images/PROD019-3.jpg (100%) rename {install => setup}/import/images/PROD019-4.jpg (100%) rename {install => setup}/import/images/PROD019-5.jpg (100%) rename {install => setup}/import/images/PROD020-1.jpg (100%) rename {install => setup}/import/images/PROD021-1.jpg (100%) rename {install => setup}/import/images/PROD021-2.jpg (100%) rename {install => setup}/import/images/PROD021-3.jpg (100%) rename {install => setup}/import/images/PROD021-4.jpg (100%) rename {install => setup}/import/images/PROD022-1.jpg (100%) rename {install => setup}/import/images/PROD022-2.jpg (100%) rename {install => setup}/import/images/PROD022-3.jpg (100%) rename {install => setup}/import/images/PROD022-4.jpg (100%) rename {install => setup}/import/images/PROD022-5.jpg (100%) rename {install => setup}/import/images/PROD023-1.jpg (100%) rename {install => setup}/import/images/PROD023-2.jpg (100%) rename {install => setup}/import/images/PROD023-3.jpg (100%) rename {install => setup}/import/images/PROD023-4.jpg (100%) rename {install => setup}/import/images/PROD023-5.jpg (100%) rename {install => setup}/import/images/PROD023-6.jpg (100%) rename {install => setup}/import/images/PROD024-1.jpg (100%) rename {install => setup}/import/images/PROD024-2.jpg (100%) rename {install => setup}/import/images/PROD024-3.jpg (100%) rename {install => setup}/import/images/PROD024-4.jpg (100%) rename {install => setup}/import/images/PROD024-5.jpg (100%) rename {install => setup}/import/images/PROD025-1.jpg (100%) rename {install => setup}/import/images/PROD025-2.jpg (100%) rename {install => setup}/import/images/PROD025-3.jpg (100%) rename {install => setup}/import/images/PROD026-1.jpg (100%) rename {install => setup}/import/images/PROD027-1.jpg (100%) rename {install => setup}/import/images/PROD028-1.jpg (100%) rename {install => setup}/import/images/PROD029-1.jpg (100%) rename {install => setup}/import/images/PROD030-1.jpg (100%) rename {install => setup}/import/images/PROD030-2.jpg (100%) rename {install => setup}/import/images/PROD030-3.jpg (100%) rename {install => setup}/import/images/PROD030-4.jpg (100%) rename {install => setup}/import/products.csv (100%) rename {install => setup}/insert.sql (100%) rename {install => setup}/tax_faker.php (100%) rename {install => setup}/thelia.sql (100%) rename {install => setup}/update/2.0.0-RC1.sql (100%) rename {install => setup}/update/2.0.0-beta2.sql (100%) rename {install => setup}/update/2.0.0-beta3.sql (100%) rename {install => setup}/update/2.0.0-beta4.sql (100%) rename {install => setup}/update/2.0.0.sql (100%) diff --git a/.travis.yml b/.travis.yml index eb6e3a046..56524f1a5 100755 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_script: - composer install --prefer-dist --dev - sh -c "mysql -u$DB_USER -e 'SET FOREIGN_KEY_CHECKS = 0; DROP DATABASE IF EXISTS thelia;SET FOREIGN_KEY_CHECKS = 1;'; fi" - php Thelia thelia:install --db_host=localhost --db_username=$DB_USER --db_name=thelia - - php install/faker.php + - php setup/faker.php - php Thelia module:activate Colissimo - php Thelia module:activate Cheque diff --git a/core/lib/Thelia/Install/Database.php b/core/lib/Thelia/Install/Database.php index e09ea3b4b..eddab4eda 100644 --- a/core/lib/Thelia/Install/Database.php +++ b/core/lib/Thelia/Install/Database.php @@ -84,8 +84,8 @@ class Database if (null === $extraSqlFiles) { $sql = array_merge( $sql, - $this->prepareSql(file_get_contents(THELIA_ROOT . '/install/thelia.sql')), - $this->prepareSql(file_get_contents(THELIA_ROOT . '/install/insert.sql')) + $this->prepareSql(file_get_contents(THELIA_ROOT . '/setup/thelia.sql')), + $this->prepareSql(file_get_contents(THELIA_ROOT . '/setup/insert.sql')) ); } else { foreach ($extraSqlFiles as $fileToInsert) { diff --git a/core/lib/Thelia/Install/Update.php b/core/lib/Thelia/Install/Update.php index d80fe294a..6f8f9b6e4 100644 --- a/core/lib/Thelia/Install/Update.php +++ b/core/lib/Thelia/Install/Update.php @@ -93,9 +93,9 @@ class Update protected function updateToVersion($version, Database $database,Tlog $logger) { - if (file_exists(THELIA_ROOT . '/install/update/'.$version.'.sql')) { + if (file_exists(THELIA_ROOT . '/setup/update/'.$version.'.sql')) { $logger->debug(sprintf('inserting file %s', $version.'$sql')); - $database->insertSql(null, array(THELIA_ROOT . '/install/update/'.$version.'.sql')); + $database->insertSql(null, array(THELIA_ROOT . '/setup/update/'.$version.'.sql')); $logger->debug(sprintf('end inserting file %s', $version.'$sql')); } diff --git a/reset_install.bat b/reset_install.bat index 4deec3f46..1e2912f53 100644 --- a/reset_install.bat +++ b/reset_install.bat @@ -22,16 +22,16 @@ if exist local\config\database.yml ( ..\..\bin\propel build -v --output-dir=../../core/lib/ --enable-identifier-quoting echo [INFO] Building SQL CREATE file - ..\..\bin\propel sql:build -v --output-dir=..\..\install + ..\..\bin\propel sql:build -v --output-dir=..\..\setup echo [INFO] Reloading Thelia2 database cd ..\.. - del install\sqldb.map + del setup\sqldb.map php Thelia thelia:dev:reloadDB echo [INFO] Installing fixtures - php install\faker.php + php setup\faker.php echo [INFO] Clearing caches php Thelia cache:clear diff --git a/reset_install.sh b/reset_install.sh index 684b12abb..40216a643 100755 --- a/reset_install.sh +++ b/reset_install.sh @@ -21,15 +21,15 @@ echo -e "\n\033[01;34m[INFO] Building Models file\033[00m\n" ../../bin/propel build -v --output-dir=../../core/lib/ --enable-identifier-quoting echo -e "\n\033[01;34m[INFO] Building SQL CREATE file\033[00m\n" -../../bin/propel sql:build -v --output-dir=../../install/ +../../bin/propel sql:build -v --output-dir=../../setup/ echo -e "\n\033[01;34m[INFO] Reloading Thelia2 database\033[00m\n" cd ../.. -rm install/sqldb.map +rm setup/sqldb.map php Thelia thelia:dev:reloadDB echo -e "\n\033[01;34m[INFO] Installing fixtures\033[00m\n" -php install/faker.php +php setup/faker.php echo -e "\n\033[01;34m[INFO] Adding admin\033[00m\n" php Thelia admin:create --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2 diff --git a/run_casperjs.sh b/run_casperjs.sh index 88636a9d1..5bdca95f4 100755 --- a/run_casperjs.sh +++ b/run_casperjs.sh @@ -9,7 +9,7 @@ echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n" ../../bin/propel build -v --output-dir=../../core/lib/ echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n" -../../bin/propel sql:build -v --output-dir=../../install/ +../../bin/propel sql:build -v --output-dir=../../setup/ echo -e "\n\e[01;34m[INFO] Reloaded Thelia2 database\e[00m\n" cd ../.. @@ -17,7 +17,7 @@ rm install/sqldb.map php Thelia thelia:dev:reloadDB echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n" -php install/faker.php +php setup/faker.php echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n" php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2 diff --git a/install/.gitkeep b/setup/.gitkeep similarity index 100% rename from install/.gitkeep rename to setup/.gitkeep diff --git a/install/.htaccess b/setup/.htaccess similarity index 100% rename from install/.htaccess rename to setup/.htaccess diff --git a/install/INSTALL-TODO.txt b/setup/INSTALL-TODO.txt similarity index 100% rename from install/INSTALL-TODO.txt rename to setup/INSTALL-TODO.txt diff --git a/install/faker-assets/FreeSans.ttf b/setup/faker-assets/FreeSans.ttf similarity index 100% rename from install/faker-assets/FreeSans.ttf rename to setup/faker-assets/FreeSans.ttf diff --git a/install/faker.php b/setup/faker.php similarity index 100% rename from install/faker.php rename to setup/faker.php diff --git a/install/faker_100categories_1000products_4locales.php b/setup/faker_100categories_1000products_4locales.php similarity index 100% rename from install/faker_100categories_1000products_4locales.php rename to setup/faker_100categories_1000products_4locales.php diff --git a/install/faker_add_ecotax.php b/setup/faker_add_ecotax.php similarity index 100% rename from install/faker_add_ecotax.php rename to setup/faker_add_ecotax.php diff --git a/install/import.php b/setup/import.php similarity index 96% rename from install/import.php rename to setup/import.php index 49df3ef3e..913801fb2 100644 --- a/install/import.php +++ b/setup/import.php @@ -83,7 +83,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co { echo "start creating products\n"; $fileSystem = new \Symfony\Component\Filesystem\Filesystem(); - if (($handle = fopen(THELIA_ROOT . '/install/import/products.csv', "r")) !== FALSE) { + if (($handle = fopen(THELIA_ROOT . '/setup/import/products.csv', "r")) !== FALSE) { $row=0; while (($data = fgetcsv($handle, 100000, ";")) !== FALSE) { $row++; @@ -134,7 +134,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co ->setProduct($product) ->setFile($image) ->save($con); - $fileSystem->copy(THELIA_ROOT . 'install/import/images/'.$image, THELIA_ROOT . 'local/media/images/product/'.$image, true); + $fileSystem->copy(THELIA_ROOT . 'setup/import/images/'.$image, THELIA_ROOT . 'local/media/images/product/'.$image, true); } $pses = explode(";", $data[12]); @@ -199,7 +199,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co function createBrand($con) { echo "start creating brands feature\n"; - if (($handle = fopen(THELIA_ROOT . '/install/import/brand.csv', "r")) !== FALSE) { + if (($handle = fopen(THELIA_ROOT . '/setup/import/brand.csv', "r")) !== FALSE) { $row=0; $feature = new \Thelia\Model\Feature(); $feature @@ -232,7 +232,7 @@ function createCategories($con) { echo "start creating categories\n"; $categories = array(); - if (($handle = fopen(THELIA_ROOT . '/install/import/categories.csv', "r")) !== FALSE) { + if (($handle = fopen(THELIA_ROOT . '/setup/import/categories.csv', "r")) !== FALSE) { $row=0; while (($data = fgetcsv($handle, 1000, ";")) !== FALSE) { $row++; @@ -259,7 +259,7 @@ function createCategories($con) function createColors($con) { echo "start creating colors attributes\n"; - if (($handle = fopen(THELIA_ROOT . '/install/import/colors.csv', "r")) !== FALSE) { + if (($handle = fopen(THELIA_ROOT . '/setup/import/colors.csv', "r")) !== FALSE) { $row=0; $attribute = new \Thelia\Model\Attribute(); $attribute diff --git a/install/import/brand.csv b/setup/import/brand.csv similarity index 100% rename from install/import/brand.csv rename to setup/import/brand.csv diff --git a/install/import/categories.csv b/setup/import/categories.csv similarity index 100% rename from install/import/categories.csv rename to setup/import/categories.csv diff --git a/install/import/colors.csv b/setup/import/colors.csv similarity index 100% rename from install/import/colors.csv rename to setup/import/colors.csv diff --git a/install/import/images/PROD001-1.jpg b/setup/import/images/PROD001-1.jpg similarity index 100% rename from install/import/images/PROD001-1.jpg rename to setup/import/images/PROD001-1.jpg diff --git a/install/import/images/PROD001-2.jpg b/setup/import/images/PROD001-2.jpg similarity index 100% rename from install/import/images/PROD001-2.jpg rename to setup/import/images/PROD001-2.jpg diff --git a/install/import/images/PROD001-3.jpg b/setup/import/images/PROD001-3.jpg similarity index 100% rename from install/import/images/PROD001-3.jpg rename to setup/import/images/PROD001-3.jpg diff --git a/install/import/images/PROD001-4.jpg b/setup/import/images/PROD001-4.jpg similarity index 100% rename from install/import/images/PROD001-4.jpg rename to setup/import/images/PROD001-4.jpg diff --git a/install/import/images/PROD001-5.jpg b/setup/import/images/PROD001-5.jpg similarity index 100% rename from install/import/images/PROD001-5.jpg rename to setup/import/images/PROD001-5.jpg diff --git a/install/import/images/PROD002-1.jpg b/setup/import/images/PROD002-1.jpg similarity index 100% rename from install/import/images/PROD002-1.jpg rename to setup/import/images/PROD002-1.jpg diff --git a/install/import/images/PROD002-2.jpg b/setup/import/images/PROD002-2.jpg similarity index 100% rename from install/import/images/PROD002-2.jpg rename to setup/import/images/PROD002-2.jpg diff --git a/install/import/images/PROD002-3.jpg b/setup/import/images/PROD002-3.jpg similarity index 100% rename from install/import/images/PROD002-3.jpg rename to setup/import/images/PROD002-3.jpg diff --git a/install/import/images/PROD002-4.jpg b/setup/import/images/PROD002-4.jpg similarity index 100% rename from install/import/images/PROD002-4.jpg rename to setup/import/images/PROD002-4.jpg diff --git a/install/import/images/PROD002-5.jpg b/setup/import/images/PROD002-5.jpg similarity index 100% rename from install/import/images/PROD002-5.jpg rename to setup/import/images/PROD002-5.jpg diff --git a/install/import/images/PROD002-6.jpg b/setup/import/images/PROD002-6.jpg similarity index 100% rename from install/import/images/PROD002-6.jpg rename to setup/import/images/PROD002-6.jpg diff --git a/install/import/images/PROD003-1.jpg b/setup/import/images/PROD003-1.jpg similarity index 100% rename from install/import/images/PROD003-1.jpg rename to setup/import/images/PROD003-1.jpg diff --git a/install/import/images/PROD003-2.jpg b/setup/import/images/PROD003-2.jpg similarity index 100% rename from install/import/images/PROD003-2.jpg rename to setup/import/images/PROD003-2.jpg diff --git a/install/import/images/PROD003-3.jpg b/setup/import/images/PROD003-3.jpg similarity index 100% rename from install/import/images/PROD003-3.jpg rename to setup/import/images/PROD003-3.jpg diff --git a/install/import/images/PROD004-1.jpg b/setup/import/images/PROD004-1.jpg similarity index 100% rename from install/import/images/PROD004-1.jpg rename to setup/import/images/PROD004-1.jpg diff --git a/install/import/images/PROD004-2.jpg b/setup/import/images/PROD004-2.jpg similarity index 100% rename from install/import/images/PROD004-2.jpg rename to setup/import/images/PROD004-2.jpg diff --git a/install/import/images/PROD005-1.jpg b/setup/import/images/PROD005-1.jpg similarity index 100% rename from install/import/images/PROD005-1.jpg rename to setup/import/images/PROD005-1.jpg diff --git a/install/import/images/PROD005-2.jpg b/setup/import/images/PROD005-2.jpg similarity index 100% rename from install/import/images/PROD005-2.jpg rename to setup/import/images/PROD005-2.jpg diff --git a/install/import/images/PROD005-3.jpg b/setup/import/images/PROD005-3.jpg similarity index 100% rename from install/import/images/PROD005-3.jpg rename to setup/import/images/PROD005-3.jpg diff --git a/install/import/images/PROD005-4.jpg b/setup/import/images/PROD005-4.jpg similarity index 100% rename from install/import/images/PROD005-4.jpg rename to setup/import/images/PROD005-4.jpg diff --git a/install/import/images/PROD005-5.jpg b/setup/import/images/PROD005-5.jpg similarity index 100% rename from install/import/images/PROD005-5.jpg rename to setup/import/images/PROD005-5.jpg diff --git a/install/import/images/PROD005-6.jpg b/setup/import/images/PROD005-6.jpg similarity index 100% rename from install/import/images/PROD005-6.jpg rename to setup/import/images/PROD005-6.jpg diff --git a/install/import/images/PROD006-1.jpg b/setup/import/images/PROD006-1.jpg similarity index 100% rename from install/import/images/PROD006-1.jpg rename to setup/import/images/PROD006-1.jpg diff --git a/install/import/images/PROD006-2.jpg b/setup/import/images/PROD006-2.jpg similarity index 100% rename from install/import/images/PROD006-2.jpg rename to setup/import/images/PROD006-2.jpg diff --git a/install/import/images/PROD006-3.jpg b/setup/import/images/PROD006-3.jpg similarity index 100% rename from install/import/images/PROD006-3.jpg rename to setup/import/images/PROD006-3.jpg diff --git a/install/import/images/PROD006-4.jpg b/setup/import/images/PROD006-4.jpg similarity index 100% rename from install/import/images/PROD006-4.jpg rename to setup/import/images/PROD006-4.jpg diff --git a/install/import/images/PROD006-5.jpg b/setup/import/images/PROD006-5.jpg similarity index 100% rename from install/import/images/PROD006-5.jpg rename to setup/import/images/PROD006-5.jpg diff --git a/install/import/images/PROD006-6.jpg b/setup/import/images/PROD006-6.jpg similarity index 100% rename from install/import/images/PROD006-6.jpg rename to setup/import/images/PROD006-6.jpg diff --git a/install/import/images/PROD007-1.jpg b/setup/import/images/PROD007-1.jpg similarity index 100% rename from install/import/images/PROD007-1.jpg rename to setup/import/images/PROD007-1.jpg diff --git a/install/import/images/PROD007-2.jpg b/setup/import/images/PROD007-2.jpg similarity index 100% rename from install/import/images/PROD007-2.jpg rename to setup/import/images/PROD007-2.jpg diff --git a/install/import/images/PROD007-3.jpg b/setup/import/images/PROD007-3.jpg similarity index 100% rename from install/import/images/PROD007-3.jpg rename to setup/import/images/PROD007-3.jpg diff --git a/install/import/images/PROD007-4.jpg b/setup/import/images/PROD007-4.jpg similarity index 100% rename from install/import/images/PROD007-4.jpg rename to setup/import/images/PROD007-4.jpg diff --git a/install/import/images/PROD008-1.jpg b/setup/import/images/PROD008-1.jpg similarity index 100% rename from install/import/images/PROD008-1.jpg rename to setup/import/images/PROD008-1.jpg diff --git a/install/import/images/PROD008-2.jpg b/setup/import/images/PROD008-2.jpg similarity index 100% rename from install/import/images/PROD008-2.jpg rename to setup/import/images/PROD008-2.jpg diff --git a/install/import/images/PROD008-3.jpg b/setup/import/images/PROD008-3.jpg similarity index 100% rename from install/import/images/PROD008-3.jpg rename to setup/import/images/PROD008-3.jpg diff --git a/install/import/images/PROD008-4.jpg b/setup/import/images/PROD008-4.jpg similarity index 100% rename from install/import/images/PROD008-4.jpg rename to setup/import/images/PROD008-4.jpg diff --git a/install/import/images/PROD008-5.jpg b/setup/import/images/PROD008-5.jpg similarity index 100% rename from install/import/images/PROD008-5.jpg rename to setup/import/images/PROD008-5.jpg diff --git a/install/import/images/PROD009-1.jpg b/setup/import/images/PROD009-1.jpg similarity index 100% rename from install/import/images/PROD009-1.jpg rename to setup/import/images/PROD009-1.jpg diff --git a/install/import/images/PROD009-2.jpg b/setup/import/images/PROD009-2.jpg similarity index 100% rename from install/import/images/PROD009-2.jpg rename to setup/import/images/PROD009-2.jpg diff --git a/install/import/images/PROD009-3.jpg b/setup/import/images/PROD009-3.jpg similarity index 100% rename from install/import/images/PROD009-3.jpg rename to setup/import/images/PROD009-3.jpg diff --git a/install/import/images/PROD010-1.jpg b/setup/import/images/PROD010-1.jpg similarity index 100% rename from install/import/images/PROD010-1.jpg rename to setup/import/images/PROD010-1.jpg diff --git a/install/import/images/PROD010-2.jpg b/setup/import/images/PROD010-2.jpg similarity index 100% rename from install/import/images/PROD010-2.jpg rename to setup/import/images/PROD010-2.jpg diff --git a/install/import/images/PROD010-3.jpg b/setup/import/images/PROD010-3.jpg similarity index 100% rename from install/import/images/PROD010-3.jpg rename to setup/import/images/PROD010-3.jpg diff --git a/install/import/images/PROD010-4.jpg b/setup/import/images/PROD010-4.jpg similarity index 100% rename from install/import/images/PROD010-4.jpg rename to setup/import/images/PROD010-4.jpg diff --git a/install/import/images/PROD011-1.jpg b/setup/import/images/PROD011-1.jpg similarity index 100% rename from install/import/images/PROD011-1.jpg rename to setup/import/images/PROD011-1.jpg diff --git a/install/import/images/PROD011-2.jpg b/setup/import/images/PROD011-2.jpg similarity index 100% rename from install/import/images/PROD011-2.jpg rename to setup/import/images/PROD011-2.jpg diff --git a/install/import/images/PROD011-3.jpg b/setup/import/images/PROD011-3.jpg similarity index 100% rename from install/import/images/PROD011-3.jpg rename to setup/import/images/PROD011-3.jpg diff --git a/install/import/images/PROD011-4.jpg b/setup/import/images/PROD011-4.jpg similarity index 100% rename from install/import/images/PROD011-4.jpg rename to setup/import/images/PROD011-4.jpg diff --git a/install/import/images/PROD012-1.jpg b/setup/import/images/PROD012-1.jpg similarity index 100% rename from install/import/images/PROD012-1.jpg rename to setup/import/images/PROD012-1.jpg diff --git a/install/import/images/PROD012-2.jpg b/setup/import/images/PROD012-2.jpg similarity index 100% rename from install/import/images/PROD012-2.jpg rename to setup/import/images/PROD012-2.jpg diff --git a/install/import/images/PROD013-1.jpg b/setup/import/images/PROD013-1.jpg similarity index 100% rename from install/import/images/PROD013-1.jpg rename to setup/import/images/PROD013-1.jpg diff --git a/install/import/images/PROD014-1.jpg b/setup/import/images/PROD014-1.jpg similarity index 100% rename from install/import/images/PROD014-1.jpg rename to setup/import/images/PROD014-1.jpg diff --git a/install/import/images/PROD014-2.jpg b/setup/import/images/PROD014-2.jpg similarity index 100% rename from install/import/images/PROD014-2.jpg rename to setup/import/images/PROD014-2.jpg diff --git a/install/import/images/PROD014-3.jpg b/setup/import/images/PROD014-3.jpg similarity index 100% rename from install/import/images/PROD014-3.jpg rename to setup/import/images/PROD014-3.jpg diff --git a/install/import/images/PROD014-4.jpg b/setup/import/images/PROD014-4.jpg similarity index 100% rename from install/import/images/PROD014-4.jpg rename to setup/import/images/PROD014-4.jpg diff --git a/install/import/images/PROD015-1.jpg b/setup/import/images/PROD015-1.jpg similarity index 100% rename from install/import/images/PROD015-1.jpg rename to setup/import/images/PROD015-1.jpg diff --git a/install/import/images/PROD015-2.jpg b/setup/import/images/PROD015-2.jpg similarity index 100% rename from install/import/images/PROD015-2.jpg rename to setup/import/images/PROD015-2.jpg diff --git a/install/import/images/PROD016-1.jpg b/setup/import/images/PROD016-1.jpg similarity index 100% rename from install/import/images/PROD016-1.jpg rename to setup/import/images/PROD016-1.jpg diff --git a/install/import/images/PROD017-1.jpg b/setup/import/images/PROD017-1.jpg similarity index 100% rename from install/import/images/PROD017-1.jpg rename to setup/import/images/PROD017-1.jpg diff --git a/install/import/images/PROD017-2.jpg b/setup/import/images/PROD017-2.jpg similarity index 100% rename from install/import/images/PROD017-2.jpg rename to setup/import/images/PROD017-2.jpg diff --git a/install/import/images/PROD017-3.jpg b/setup/import/images/PROD017-3.jpg similarity index 100% rename from install/import/images/PROD017-3.jpg rename to setup/import/images/PROD017-3.jpg diff --git a/install/import/images/PROD017-4.jpg b/setup/import/images/PROD017-4.jpg similarity index 100% rename from install/import/images/PROD017-4.jpg rename to setup/import/images/PROD017-4.jpg diff --git a/install/import/images/PROD018-1.jpg b/setup/import/images/PROD018-1.jpg similarity index 100% rename from install/import/images/PROD018-1.jpg rename to setup/import/images/PROD018-1.jpg diff --git a/install/import/images/PROD019-1.jpg b/setup/import/images/PROD019-1.jpg similarity index 100% rename from install/import/images/PROD019-1.jpg rename to setup/import/images/PROD019-1.jpg diff --git a/install/import/images/PROD019-2.jpg b/setup/import/images/PROD019-2.jpg similarity index 100% rename from install/import/images/PROD019-2.jpg rename to setup/import/images/PROD019-2.jpg diff --git a/install/import/images/PROD019-3.jpg b/setup/import/images/PROD019-3.jpg similarity index 100% rename from install/import/images/PROD019-3.jpg rename to setup/import/images/PROD019-3.jpg diff --git a/install/import/images/PROD019-4.jpg b/setup/import/images/PROD019-4.jpg similarity index 100% rename from install/import/images/PROD019-4.jpg rename to setup/import/images/PROD019-4.jpg diff --git a/install/import/images/PROD019-5.jpg b/setup/import/images/PROD019-5.jpg similarity index 100% rename from install/import/images/PROD019-5.jpg rename to setup/import/images/PROD019-5.jpg diff --git a/install/import/images/PROD020-1.jpg b/setup/import/images/PROD020-1.jpg similarity index 100% rename from install/import/images/PROD020-1.jpg rename to setup/import/images/PROD020-1.jpg diff --git a/install/import/images/PROD021-1.jpg b/setup/import/images/PROD021-1.jpg similarity index 100% rename from install/import/images/PROD021-1.jpg rename to setup/import/images/PROD021-1.jpg diff --git a/install/import/images/PROD021-2.jpg b/setup/import/images/PROD021-2.jpg similarity index 100% rename from install/import/images/PROD021-2.jpg rename to setup/import/images/PROD021-2.jpg diff --git a/install/import/images/PROD021-3.jpg b/setup/import/images/PROD021-3.jpg similarity index 100% rename from install/import/images/PROD021-3.jpg rename to setup/import/images/PROD021-3.jpg diff --git a/install/import/images/PROD021-4.jpg b/setup/import/images/PROD021-4.jpg similarity index 100% rename from install/import/images/PROD021-4.jpg rename to setup/import/images/PROD021-4.jpg diff --git a/install/import/images/PROD022-1.jpg b/setup/import/images/PROD022-1.jpg similarity index 100% rename from install/import/images/PROD022-1.jpg rename to setup/import/images/PROD022-1.jpg diff --git a/install/import/images/PROD022-2.jpg b/setup/import/images/PROD022-2.jpg similarity index 100% rename from install/import/images/PROD022-2.jpg rename to setup/import/images/PROD022-2.jpg diff --git a/install/import/images/PROD022-3.jpg b/setup/import/images/PROD022-3.jpg similarity index 100% rename from install/import/images/PROD022-3.jpg rename to setup/import/images/PROD022-3.jpg diff --git a/install/import/images/PROD022-4.jpg b/setup/import/images/PROD022-4.jpg similarity index 100% rename from install/import/images/PROD022-4.jpg rename to setup/import/images/PROD022-4.jpg diff --git a/install/import/images/PROD022-5.jpg b/setup/import/images/PROD022-5.jpg similarity index 100% rename from install/import/images/PROD022-5.jpg rename to setup/import/images/PROD022-5.jpg diff --git a/install/import/images/PROD023-1.jpg b/setup/import/images/PROD023-1.jpg similarity index 100% rename from install/import/images/PROD023-1.jpg rename to setup/import/images/PROD023-1.jpg diff --git a/install/import/images/PROD023-2.jpg b/setup/import/images/PROD023-2.jpg similarity index 100% rename from install/import/images/PROD023-2.jpg rename to setup/import/images/PROD023-2.jpg diff --git a/install/import/images/PROD023-3.jpg b/setup/import/images/PROD023-3.jpg similarity index 100% rename from install/import/images/PROD023-3.jpg rename to setup/import/images/PROD023-3.jpg diff --git a/install/import/images/PROD023-4.jpg b/setup/import/images/PROD023-4.jpg similarity index 100% rename from install/import/images/PROD023-4.jpg rename to setup/import/images/PROD023-4.jpg diff --git a/install/import/images/PROD023-5.jpg b/setup/import/images/PROD023-5.jpg similarity index 100% rename from install/import/images/PROD023-5.jpg rename to setup/import/images/PROD023-5.jpg diff --git a/install/import/images/PROD023-6.jpg b/setup/import/images/PROD023-6.jpg similarity index 100% rename from install/import/images/PROD023-6.jpg rename to setup/import/images/PROD023-6.jpg diff --git a/install/import/images/PROD024-1.jpg b/setup/import/images/PROD024-1.jpg similarity index 100% rename from install/import/images/PROD024-1.jpg rename to setup/import/images/PROD024-1.jpg diff --git a/install/import/images/PROD024-2.jpg b/setup/import/images/PROD024-2.jpg similarity index 100% rename from install/import/images/PROD024-2.jpg rename to setup/import/images/PROD024-2.jpg diff --git a/install/import/images/PROD024-3.jpg b/setup/import/images/PROD024-3.jpg similarity index 100% rename from install/import/images/PROD024-3.jpg rename to setup/import/images/PROD024-3.jpg diff --git a/install/import/images/PROD024-4.jpg b/setup/import/images/PROD024-4.jpg similarity index 100% rename from install/import/images/PROD024-4.jpg rename to setup/import/images/PROD024-4.jpg diff --git a/install/import/images/PROD024-5.jpg b/setup/import/images/PROD024-5.jpg similarity index 100% rename from install/import/images/PROD024-5.jpg rename to setup/import/images/PROD024-5.jpg diff --git a/install/import/images/PROD025-1.jpg b/setup/import/images/PROD025-1.jpg similarity index 100% rename from install/import/images/PROD025-1.jpg rename to setup/import/images/PROD025-1.jpg diff --git a/install/import/images/PROD025-2.jpg b/setup/import/images/PROD025-2.jpg similarity index 100% rename from install/import/images/PROD025-2.jpg rename to setup/import/images/PROD025-2.jpg diff --git a/install/import/images/PROD025-3.jpg b/setup/import/images/PROD025-3.jpg similarity index 100% rename from install/import/images/PROD025-3.jpg rename to setup/import/images/PROD025-3.jpg diff --git a/install/import/images/PROD026-1.jpg b/setup/import/images/PROD026-1.jpg similarity index 100% rename from install/import/images/PROD026-1.jpg rename to setup/import/images/PROD026-1.jpg diff --git a/install/import/images/PROD027-1.jpg b/setup/import/images/PROD027-1.jpg similarity index 100% rename from install/import/images/PROD027-1.jpg rename to setup/import/images/PROD027-1.jpg diff --git a/install/import/images/PROD028-1.jpg b/setup/import/images/PROD028-1.jpg similarity index 100% rename from install/import/images/PROD028-1.jpg rename to setup/import/images/PROD028-1.jpg diff --git a/install/import/images/PROD029-1.jpg b/setup/import/images/PROD029-1.jpg similarity index 100% rename from install/import/images/PROD029-1.jpg rename to setup/import/images/PROD029-1.jpg diff --git a/install/import/images/PROD030-1.jpg b/setup/import/images/PROD030-1.jpg similarity index 100% rename from install/import/images/PROD030-1.jpg rename to setup/import/images/PROD030-1.jpg diff --git a/install/import/images/PROD030-2.jpg b/setup/import/images/PROD030-2.jpg similarity index 100% rename from install/import/images/PROD030-2.jpg rename to setup/import/images/PROD030-2.jpg diff --git a/install/import/images/PROD030-3.jpg b/setup/import/images/PROD030-3.jpg similarity index 100% rename from install/import/images/PROD030-3.jpg rename to setup/import/images/PROD030-3.jpg diff --git a/install/import/images/PROD030-4.jpg b/setup/import/images/PROD030-4.jpg similarity index 100% rename from install/import/images/PROD030-4.jpg rename to setup/import/images/PROD030-4.jpg diff --git a/install/import/products.csv b/setup/import/products.csv similarity index 100% rename from install/import/products.csv rename to setup/import/products.csv diff --git a/install/insert.sql b/setup/insert.sql similarity index 100% rename from install/insert.sql rename to setup/insert.sql diff --git a/install/tax_faker.php b/setup/tax_faker.php similarity index 100% rename from install/tax_faker.php rename to setup/tax_faker.php diff --git a/install/thelia.sql b/setup/thelia.sql similarity index 100% rename from install/thelia.sql rename to setup/thelia.sql diff --git a/install/update/2.0.0-RC1.sql b/setup/update/2.0.0-RC1.sql similarity index 100% rename from install/update/2.0.0-RC1.sql rename to setup/update/2.0.0-RC1.sql diff --git a/install/update/2.0.0-beta2.sql b/setup/update/2.0.0-beta2.sql similarity index 100% rename from install/update/2.0.0-beta2.sql rename to setup/update/2.0.0-beta2.sql diff --git a/install/update/2.0.0-beta3.sql b/setup/update/2.0.0-beta3.sql similarity index 100% rename from install/update/2.0.0-beta3.sql rename to setup/update/2.0.0-beta3.sql diff --git a/install/update/2.0.0-beta4.sql b/setup/update/2.0.0-beta4.sql similarity index 100% rename from install/update/2.0.0-beta4.sql rename to setup/update/2.0.0-beta4.sql diff --git a/install/update/2.0.0.sql b/setup/update/2.0.0.sql similarity index 100% rename from install/update/2.0.0.sql rename to setup/update/2.0.0.sql