atomicshop 2.11.22__py3-none-any.whl → 2.11.24__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.11.22'
+__version__ = '2.11.24'

atomicshop/wrappers/dockerw/install_docker.py

@@ -134,7 +134,7 @@ def install_docker_ubuntu(
 
     if rootless:
         # Install uidmap package.
-        if not ubuntu_terminal.is_executable_exists('uidmap'):
+        if not ubuntu_terminal.is_package_installed('uidmap'):
             print_api('uidmap is not installed, installing...', color='yellow')
             ubuntu_terminal.update_system_packages()
             ubuntu_terminal.install_packages(['uidmap'])
@@ -156,13 +156,10 @@ def install_docker_ubuntu(
         process.execute_script(docker_start_command, shell=True, executable=None)
         process.execute_script(docker_enable_command, shell=True, executable=None)
 
-        input("Press Enter to continue...")
-
         with permissions.temporary_regular_permissions():
             current_non_sudo_user = os.getlogin()
         # Enable lingering so Docker runs when the user is not logged in
         process.execute_script(f'sudo loginctl enable-linger {current_non_sudo_user}', shell=True)
-        input("Press Enter to continue...")
 
         # Add $HOME/bin to your PATH if it's not already there.
         with permissions.temporary_regular_permissions():

atomicshop/wrappers/ubuntu_terminal.py

@@ -21,6 +21,27 @@ def install_packages(package_list: list[str]):
     subprocess.check_call(command)
 
 
+def is_package_installed(package: str) -> bool:
+    """
+    Function checks if a package is installed.
+    :param package: str, package name.
+    :return:
+    """
+
+    try:
+        # Run the dpkg-query command to check if the package is installed
+        result = subprocess.run(
+            ['apt', '-qq', 'list', '--installed', package], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # If the return code is 0 and the output contains 'install ok installed', the package is installed
+        if result.returncode == 0 and result.stdout != b'':
+            return True
+        else:
+            return False
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        return False
+
+
 def is_package_in_apt_cache(package: str) -> bool:
     try:
         # Run the apt-cache show command to check if the package exists
@@ -228,11 +249,15 @@ def add_path_to_bashrc(as_regular_user: bool = False):
             print("$HOME/bin already in .bashrc")
 
 
-def get_command_execution_as_sudo_executer(command: str) -> str:
+def get_command_execution_as_sudo_executer(command: str, add_bash_exec: bool = False) -> str:
     """
     Function gets the command execution as the sudo executer.
     The input command should be without 'sudo', if it will be, it will be omitted.
     :param command: str, the command to execute.
+    :param add_bash_exec: bool, if True, the command will be executed with bash.
+        Example command: 'systemctl --user start docker.service'
+        Example command with add_bash_exec: 'su <sudo_executioner_user> -c "/bin/bash systemctl --user start docker.service"'
+        Example command without add_bash_exec: 'su <sudo_executioner_user> -c "systemctl --user start docker.service"'
     :return: str, the command execution as the sudo executer.
     """
 
@@ -245,6 +270,8 @@ def get_command_execution_as_sudo_executer(command: str) -> str:
     sudo_executer_username: str = permissions.get_ubuntu_sudo_executer_username()
 
     if sudo_executer_username:
-        return f'su {sudo_executer_username} -c "/bin/bash {command}"'
+        if add_bash_exec:
+            command = f'/bin/bash {command}'
+        return f'su {sudo_executer_username} -c "{command}"'
     else:
         return command

{atomicshop-2.11.22.dist-info → atomicshop-2.11.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.11.22
+Version: 2.11.24
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.11.22.dist-info → atomicshop-2.11.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=J9VEZPOpY7bpVVAApDulvQp5NP0oPKwgRo2d7A0Py4w,124
+atomicshop/__init__.py,sha256=TeyboltWSXVQwI5Y9hPKYn-fVAXGLL5vSg9HS_q7rUI,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -151,7 +151,7 @@ atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLe
 atomicshop/wrappers/pipw.py,sha256=iq4pDhmrHqKbcRi3Y6_v2PQSdb4fqfAx79rsX7JEmXo,801
 atomicshop/wrappers/process_wrapper_pbtk.py,sha256=ycPmBRnv627RWks6N8OhxJQe8Gu3h3Vwj-4HswPOw0k,599
 atomicshop/wrappers/pyopensslw.py,sha256=OBWxA6EJ2vU_Qlf4M8m6ilcG3hyYB4yB0EsXUf7NhEU,6804
-atomicshop/wrappers/ubuntu_terminal.py,sha256=7CKKO700dM6GR2S_6j9lnYWlk94JudzjloAJkFTsw9U,8324
+atomicshop/wrappers/ubuntu_terminal.py,sha256=Kodf7FLBplqfLR86YaXb-JlkRVORPgLVS5P6aHkx-Vg,9541
 atomicshop/wrappers/wslw.py,sha256=AKphiHLSddL7ErevUowr3f9Y1AgGz_R3KZ3NssW07h8,6959
 atomicshop/wrappers/certauthw/certauth.py,sha256=hKedW0DOWlEigSNm8wu4SqHkCQsGJ1tJfH7s4nr3Bk0,12223
 atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute_5wfP65gwQrjw,8082
@@ -164,7 +164,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=eyF
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=ajiFiLXl1prg2kOhatfT8E2RKX7F8JjUJpwkVuKu1GY,16263
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/dockerw/dockerw.py,sha256=w8zSJr5C7cbvbuG09ORCpAe0BOcibqqL_Z2EKEBHYK4,6266
-atomicshop/wrappers/dockerw/install_docker.py,sha256=zq94ojAFrrmPX_B1eczxGTMST2x9y6J6Ry9yxHaTmcE,8565
+atomicshop/wrappers/dockerw/install_docker.py,sha256=a9X8GjRiuTRsZbUM3u2UQ2_8pZ0sdsPZSyCOD8SDidg,8473
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
 atomicshop/wrappers/elasticsearchw/elasticsearchw.py,sha256=7TqFdEFznO8NlligJhEKk1vm641ALpCYdaRl1uoXdzM,9768
@@ -242,8 +242,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.11.22.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.22.dist-info/METADATA,sha256=3-5riYcQBh8JJ66yZWuB3Zb0PepN5aGqmJjLjRkV8q4,10448
-atomicshop-2.11.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.22.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.22.dist-info/RECORD,,
+atomicshop-2.11.24.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.24.dist-info/METADATA,sha256=WNIdPwnfzXdLe2RNmXO2foCbvizbcBYiqNJcCJUQiFU,10448
+atomicshop-2.11.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.24.dist-info/RECORD,,