From 30b6c85f73f38e2cd884e00cb300e86cc7ad687d Mon Sep 17 00:00:00 2001
From: grimlink <sean.grimlink@gmail.com>
Date: Sun, 3 Mar 2024 21:58:22 +0100
Subject: [PATCH] Release v2

---
 mage | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mage b/mage
index 2c72c54..5fd596c 100755
--- a/mage
+++ b/mage
@@ -635,20 +635,19 @@ case "${@}" in
     countries="NL,BE,LU,DE"
   fi
 
-  if [[ -n "$scope" ]]; then
-    scope="--scope=stores --scope-code=${scope}"
-  fi
-
   countries="$(mage_lang_format_arguments $countries)"
   country=$(echo "${countries}" | cut -d ',' -f 1 | tr '[:lower:]' '[:upper:]')
 
-  echo "scope:$scope - countries:$countries"
-  $MAGENTO_CLI config:set $scope general/country/default $country
-  $MAGENTO_CLI config:set $scope general/country/allow $countries
-
-  if [[ -z "$scope" ]]; then
-    $MAGENTO_CLI config:set $scope general/country/destinations $countries
+  if [[ -n "$scope" ]]; then
+    echo "Setting the following countries: $countries for $scope"
+    scope="--scope=stores --scope-code=${scope}"
+  else
+    echo "Setting the following countries: $countries"
+    $MAGENTO_CLI config:set -q general/country/allow $countries
   fi
+
+  $MAGENTO_CLI config:set -q $scope general/country/default $country
+  $MAGENTO_CLI config:set -q $scope general/country/destinations $countries
   ;;
 
 "log" | "log debug")