From 8a48ea2772dc5590fef0d8f4fbecb5b3c83d2a5b Mon Sep 17 00:00:00 2001
From: Kovalit31 <nonecone20@gmail.com>
Date: Tue, 27 Feb 2024 11:43:42 +0200
Subject: [PATCH] Dev: Update to 1.2.1 with some fixes

---
 debdeploy/__init__.py                             | 2 +-
 debdeploy/tests/example/usr/bin/test-debdeploy.sh | 3 +++
 debdeploy/tools/__init__.py                       | 2 +-
 debdeploy/tools/build.py                          | 2 +-
 debdeploy/tools/files.py                          | 6 ++++--
 pyproject.toml                                    | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debdeploy/__init__.py b/debdeploy/__init__.py
index 51d4761..cfc72da 100644
--- a/debdeploy/__init__.py
+++ b/debdeploy/__init__.py
@@ -22,7 +22,7 @@
 
 from . import tools
 
-__version__ = "1.2.0b1"
+__version__ = "1.2.1"
 
 
 def parse() -> argparse.Namespace:
diff --git a/debdeploy/tests/example/usr/bin/test-debdeploy.sh b/debdeploy/tests/example/usr/bin/test-debdeploy.sh
index 230c510..71c49df 100755
--- a/debdeploy/tests/example/usr/bin/test-debdeploy.sh
+++ b/debdeploy/tests/example/usr/bin/test-debdeploy.sh
@@ -2,5 +2,8 @@ echo "You have installed test-package!"
 echo "You need to enter path for unit-testing"
 echo "Please refer to exist directory of source!"
 read -p "Dirname: " source_path
+if [ -z $source_path ]; then
+	source_path=$(pwd)
+fi
 command -v pytest >> /dev/null || (echo "You haven't installed pytest, abort!"; exit 1)
 ( cd $source_path || echo "Path not exists, abort"; exit 2 ) && pytest
diff --git a/debdeploy/tools/__init__.py b/debdeploy/tools/__init__.py
index 0d06a8f..742c0f2 100644
--- a/debdeploy/tools/__init__.py
+++ b/debdeploy/tools/__init__.py
@@ -92,7 +92,7 @@ def get_arch() -> str:
         "x86_64/amd64",
         "s390x/s390x",
         "aarch64.*/arm64",
-    ]  # Predefined
+    ]  # Predefined # TODO Add more arch
     arch = platform.machine()
     for _x in _a_re:
         pattern, repl = _x.split("/")
diff --git a/debdeploy/tools/build.py b/debdeploy/tools/build.py
index f2d4525..74b3d55 100644
--- a/debdeploy/tools/build.py
+++ b/debdeploy/tools/build.py
@@ -32,7 +32,7 @@ def build(package: control.Package, cache_dir: str, dest_dir: str) -> None:
         tools.printf(f"Directory is not a directory: '{dest_dir}'!")
     tools.printf(f"Building package {str(package)}")
     _code = execute(
-        f"sudo dpkg-deb -Sextreme -b {os.path.join(cache_dir, package.name)} \
+        f"dpkg-deb -Sextreme -b {os.path.join(cache_dir, package.name)} \
 {os.path.join(dest_dir, f'{package.name}_{package.version}_{package.arch}.deb')}"
     )
     if _code == 0:
diff --git a/debdeploy/tools/files.py b/debdeploy/tools/files.py
index 105557e..4cbc6e0 100644
--- a/debdeploy/tools/files.py
+++ b/debdeploy/tools/files.py
@@ -22,7 +22,7 @@
 from debdeploy import tools
 
 
-def get_files(package: control.Package, default_arch=None) -> list[str]:
+def get_files(package: control.Package, default_arch=tools.get_arch()) -> list[str]:
     """
     Get files from dpkg cache, what stores info about package
     """
@@ -60,7 +60,7 @@ def get_files(package: control.Package, default_arch=None) -> list[str]:
             exception=definitions.PackageNotFoundError,
         )
     if len(package_files) > 1:
-        if default_arch is None or default_arch not in package_files:
+        if default_arch not in package_files:
             tools.printf(
                 f"Can't guess default arch to build from '{archs}'!",
                 level="f",
@@ -110,6 +110,8 @@ def copy_files_to_target(files: list[str], target: str) -> None:
             tools.force_makedirs(destination)
             shutil.copystat(file.strip(), destination)
             continue
+        if os.path.islink(file):
+            print(f"{file} is link")
         shutil.copy2(file.strip(), destination)
     os.remove(package_list)
     to_chmod = []
diff --git a/pyproject.toml b/pyproject.toml
index 1908bcc..3804452 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@
 
 [project]
 name = "debdeploy"
-version = "1.2.0"
+version = "1.2.1"
 requires-python = ">=3.5"
 description = "Deb package builder from dpkg cache"
 readme = "README.md"