From 569bff7be8c1712cdd2a02f0940b6872ce425d8f Mon Sep 17 00:00:00 2001
From: Grashalmbeisser <57599830+Grashalmbeisser@users.noreply.github.com>
Date: Fri, 8 Nov 2024 15:52:34 +0100
Subject: [PATCH] added smaller bugfixes for version <3.13 package.py logging
 errors (#190)

---
 src/viur_cli/package.py | 7 ++++---
 src/viur_cli/setup.py   | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/viur_cli/package.py b/src/viur_cli/package.py
index e143766..a73aa15 100644
--- a/src/viur_cli/package.py
+++ b/src/viur_cli/package.py
@@ -8,6 +8,7 @@
 from pathlib import Path
 from urllib.request import urlretrieve
 from . import cli, echo_error, echo_info
+from operator import itemgetter
 
 REPOS = {
     "vi": ("viur-framework/viur-vi", "viur-vi.zip"),
@@ -142,7 +143,7 @@ def scriptor(version, target, profile):
 
     real_version, download_url = get_version_info("scriptor", version)
 
-    old_version = conf.get("builds.scriptor.version")
+    old_version=conf.get('builds').get('scriptor').get('version')
 
     if old_version == real_version.strip("v"):
         if not click.confirm(f"You have already installed version {old_version} of scriptor.\n"
@@ -185,7 +186,7 @@ def admin(version: str, target: str, profile):
 
     real_version, download_url = get_version_info("admin", version)
 
-    old_version = conf.get("builds.admin.version")
+    old_version=conf.get('builds').get('admin').get('version')
 
     if old_version == real_version.strip("v"):
         if not click.confirm(f"You have already installed the version {old_version} of admin.\n"
@@ -233,7 +234,7 @@ def vi(version, target, profile):
     dist_folder = conf["distribution_folder"]
 
     real_version, download_url = get_version_info("vi", version)
-    old_version = conf.get("builds.vi.version")
+    old_version = conf.get('builds').get('vi').get('version')
 
     if old_version == real_version.strip("v"):
         if not click.confirm(f"You have already installed the version {old_version} of vi.\n"
diff --git a/src/viur_cli/setup.py b/src/viur_cli/setup.py
index f95b4d6..44d23f2 100644
--- a/src/viur_cli/setup.py
+++ b/src/viur_cli/setup.py
@@ -51,9 +51,8 @@ def clean_base(app_id, author=None):
         echo_info(subprocess.check_output("git branch -D main", shell=True).decode().rstrip("\n"))
 
         subprocess.check_output("git branch -m main", shell=True)
-        echo_info(
-            f"Current branch is: {subprocess.check_output("git branch --show-current", shell=True)
-            .decode().rstrip("\n")}")
+        echo_info(f"Current branch is: {subprocess.check_output(
+            'git branch --show-current', shell=True).decode().rstrip('\n')}")
         echo_info("---")
 
     echo_info("Generating project documentation...")