Merge branch 'main' into strict1

.all-contributorsrc

@@ -1418,6 +1418,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "leissbua",
+      "name": "Michael Leiss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/68073221?v=4",
+      "profile": "https://github.com/leissbua",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "massa-man",
+      "name": "Marcos Steverlynck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26821235?v=4",
+      "profile": "https://www.riseart.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ahudock",
+      "name": "Andy Hudock",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33500977?v=4",
+      "profile": "https://github.com/ahudock",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

.ddev/commands/web/openmage-install

@@ -40,6 +40,9 @@ while :; do
      shift
  done
 
+echo "Enable maintenance mode..."
+touch maintenance.flag
+
 LOCALXML="${ROOT}/app/etc/local.xml"
 if [ -f "${LOCALXML}" ]; then
   if [[ "${QUIET_INSTALL_FLAG}" ]]; then
@@ -87,11 +90,15 @@ if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
   echo "Copying Sample Data into the OpenMage directory..."
   cp -r magento-sample-data-1.9.2.4/* "${ROOT}/"
 
+  echo "Clearing var/cache..."
+  rm -rf "${ROOT}/var/cache/"*
+
   echo "Importing Sample Data into the database..."
   mysql -u db -h db db < "${SAMPLE_DATA_DIRECTORY}/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql"
 
   # remove sample data
   if [[ "${SAMPLE_DATA_KEEP_FLAG}" ]]; then
+    # shellcheck disable=SC2046
     rm -rf $(
       find . -maxdepth 1 -type f -name "*" ! -name "${SAMPLE_DATA_FILE}")
   else
@@ -108,7 +115,11 @@ if [[ "${USE_DEFAULT_FLAG}" ]]; then
   ADMIN_LASTNAME='Administrator'
   ADMIN_EMAIL='admin@example.com'
   ADMIN_PASSWORD='veryl0ngpassw0rd'
-  TABLE_PREFIX='om_'
+  if [[ "${SAMPLE_DATA_FLAG}" ]]; then
+    TABLE_PREFIX=''
+  else
+    TABLE_PREFIX='om_'
+  fi
 else
   read -r -p "Admin User [admin]: " ADMIN_USER
   ADMIN_USER=${ADMIN_USER:-admin}
@@ -152,3 +163,6 @@ php -f install.php -- \
   --default_currency 'USD' \
   --enable_charts 'yes' \
   --skip_url_validation 'yes'
+
+echo "Disable maintenance mode..."
+rm maintenance.flag

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+
+open_collective: openmage