From affe519080099b7e4d78ed75c6a9e4d5390513a9 Mon Sep 17 00:00:00 2001
From: Anton Fedurtsya <anton@fedurtsya.com>
Date: Thu, 23 May 2024 09:22:57 +0300
Subject: [PATCH] Improve shop component recipes to install dev version of
 theme

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>
---
 parts/shared/require_theme_dev.sh |  2 ++
 shop/b-7.1.x-apex-dev.sh          | 45 -------------------------------
 shop/b-7.1.x-components.sh        |  2 +-
 shop/b-8.0.x-apex-dev.sh          | 45 -------------------------------
 shop/b-8.0.x-components.sh        |  2 +-
 5 files changed, 4 insertions(+), 92 deletions(-)
 delete mode 100755 shop/b-7.1.x-apex-dev.sh
 delete mode 100755 shop/b-8.0.x-apex-dev.sh

diff --git a/parts/shared/require_theme_dev.sh b/parts/shared/require_theme_dev.sh
index a649171..52800a2 100755
--- a/parts/shared/require_theme_dev.sh
+++ b/parts/shared/require_theme_dev.sh
@@ -20,6 +20,8 @@ if [ -z ${branch+x} ] || [ -z ${theme+x} ]; then
   exit 1
 fi
 
+mkdir -p source/source/out/
+
 if [ $theme = "twig-admin" ]; then
   git clone https://github.com/OXID-eSales/twig-admin-theme --branch="$branch" source/source/Application/views/admin_twig
   docker compose exec -T \
diff --git a/shop/b-7.1.x-apex-dev.sh b/shop/b-7.1.x-apex-dev.sh
deleted file mode 100755
index 862bbeb..0000000
--- a/shop/b-7.1.x-apex-dev.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Flags possible:
-# -e for shop edition. Possible values: CE/PE/EE
-
-edition='EE'
-while getopts e: flag; do
-  case "${flag}" in
-  e) edition=${OPTARG} ;;
-  *) ;;
-  esac
-done
-
-SCRIPT_PATH=$(dirname ${BASH_SOURCE[0]})
-cd $SCRIPT_PATH/../../../ || exit
-
-# Prepare services configuration
-make setup
-make addbasicservices
-make file=services/adminer.yml addservice
-make file=services/selenium-chrome.yml addservice
-make file=services/node.yml addservice
-
-# Configure containers
-perl -pi\
-  -e 's#error_reporting = .*#error_reporting = E_ALL ^ E_WARNING ^ E_DEPRECATED#g;'\
-  containers/php/custom.ini
-
-"${SCRIPT_PATH}/../parts/shared/prepare_shop_package.sh" -e"${edition}" -b"b-7.1.x"
-"${SCRIPT_PATH}/../parts/shared/require_twig_components.sh" -e"${edition}" -b"b-7.1.x"
-
-"${SCRIPT_PATH}/../parts/shared/require_theme_dev.sh" -t"apex" -b"b-7.1.x"
-
-"${SCRIPT_PATH}/../parts/shared/require_demodata_package.sh" -e"${edition}" -b"b-7.1.x"
-
-# Install all preconfigured dependencies
-docker compose exec -T php composer update --no-interaction
-
-# Setup the database
-"${SCRIPT_PATH}/../parts/shared/setup_database.sh"
-
-docker compose exec -T php bin/oe-console oe:theme:activate apex
-"${SCRIPT_PATH}/../parts/shared/create_admin.sh"
-
-echo "Done!"
diff --git a/shop/b-7.1.x-components.sh b/shop/b-7.1.x-components.sh
index f671c1b..0d9528f 100755
--- a/shop/b-7.1.x-components.sh
+++ b/shop/b-7.1.x-components.sh
@@ -42,7 +42,7 @@ cp ${SCRIPT_PATH}/../parts/bases/composer.json.base ./source/composer.json
 $SCRIPT_PATH/../parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.1.x"
 $SCRIPT_PATH/../parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.1.x"
 $SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.1.x"
-$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-7.1.x"
+$SCRIPT_PATH/../parts/shared/require_theme_dev.sh -t"apex" -b"b-7.1.x"
 
 $SCRIPT_PATH/../parts/shared/require_demodata_package.sh -e"${edition}" -b"b-7.1.x"
 
diff --git a/shop/b-8.0.x-apex-dev.sh b/shop/b-8.0.x-apex-dev.sh
deleted file mode 100755
index 2737c91..0000000
--- a/shop/b-8.0.x-apex-dev.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Flags possible:
-# -e for shop edition. Possible values: CE/PE/EE
-
-edition='EE'
-while getopts e: flag; do
-  case "${flag}" in
-  e) edition=${OPTARG} ;;
-  *) ;;
-  esac
-done
-
-SCRIPT_PATH=$(dirname ${BASH_SOURCE[0]})
-cd $SCRIPT_PATH/../../../ || exit
-
-# Prepare services configuration
-make setup
-make addbasicservices
-make file=services/adminer.yml addservice
-make file=services/selenium-chrome.yml addservice
-make file=services/node.yml addservice
-
-# Configure containers
-perl -pi\
-  -e 's#error_reporting = .*#error_reporting = E_ALL ^ E_WARNING ^ E_DEPRECATED#g;'\
-  containers/php/custom.ini
-
-"${SCRIPT_PATH}/../parts/shared/prepare_shop_package.sh" -e"${edition}" -b"b-8.0.x"
-"${SCRIPT_PATH}/../parts/shared/require_twig_components.sh" -e"${edition}" -b"b-8.0.x"
-
-"${SCRIPT_PATH}/../parts/shared/require_theme_dev.sh" -t"apex" -b"b-8.0.x"
-
-"${SCRIPT_PATH}/../parts/shared/require_demodata_package.sh" -e"${edition}" -b"b-8.0.x"
-
-# Install all preconfigured dependencies
-docker compose exec -T php composer update --no-interaction
-
-# Setup the database
-"${SCRIPT_PATH}/../parts/shared/setup_database.sh"
-
-docker compose exec -T php bin/oe-console oe:theme:activate apex
-"${SCRIPT_PATH}/../parts/shared/create_admin.sh"
-
-echo "Done!"
diff --git a/shop/b-8.0.x-components.sh b/shop/b-8.0.x-components.sh
index 95df4dd..fff52c3 100755
--- a/shop/b-8.0.x-components.sh
+++ b/shop/b-8.0.x-components.sh
@@ -42,7 +42,7 @@ cp ${SCRIPT_PATH}/../parts/bases/composer.json.base ./source/composer.json
 $SCRIPT_PATH/../parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-8.0.x"
 $SCRIPT_PATH/../parts/shared/require_twig_components.sh -e"${edition}" -b"b-8.0.x"
 $SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-8.0.x"
-$SCRIPT_PATH/../parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-8.0.x"
+$SCRIPT_PATH/../parts/shared/require_theme_dev.sh -t"apex" -b"b-8.0.x"
 
 $SCRIPT_PATH/../parts/shared/require_demodata_package.sh -e"${edition}" -b"b-8.0.x"