atomicshop 2.9.26__py3-none-any.whl → 2.9.28__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.9.26'
+__version__ = '2.9.28'

atomicshop/permissions.py

@@ -29,6 +29,18 @@ def is_admin() -> bool:
     return result
 
 
+def get_ubuntu_sudo_executer_username() -> str:
+    """
+    Function gets the username of the user who executed the script with sudo.
+    :return: str, username.
+    """
+
+    if 'SUDO_USER' in os.environ:
+        return os.environ['SUDO_USER']
+    else:
+        return ''
+
+
 def set_executable_permission(file_path: str):
     """
     Function sets the executable permission on a file.

atomicshop/wrappers/dockerw/install_docker.py

@@ -1,7 +1,7 @@
 import subprocess
 import getpass
 
-from ... import process, filesystem
+from ... import process, filesystem, permissions
 from ...print_api import print_api
 
 
@@ -67,14 +67,23 @@ def install_docker_ubuntu():
     # sudo docker run hello-world
     
     # Add Privileges to run docker without sudo. Add current user to Docker superuser group.
-    sudo usermod -aG docker $USER
+    # sudo usermod -aG docker $USER
     """
 
     process.execute_script(script, shell=True)
 
+    # Check if current user that executed the script is a sudo user. If not, use the current user.
+    sudo_executer_username: str = permissions.get_ubuntu_sudo_executer_username()
+    if sudo_executer_username:
+        current_user = sudo_executer_username
+    else:
+        current_user = getpass.getuser()
+
     # Add the current user to the docker group.
-    current_user: str = getpass.getuser()
-    subprocess.check_call(['sudo', 'usermod', '-aG', 'docker', current_user])
+    # subprocess.check_call(['sudo', 'usermod', '-aG', 'docker', current_user])
+    command = f"sudo usermod -aG docker {current_user}"
+    # Execute the command
+    subprocess.run(command, shell=True, capture_output=True, text=True)
 
     # Verify the installation.
     result: list = process.execute_with_live_output('sudo docker run hello-world')

{atomicshop-2.9.26.dist-info → atomicshop-2.9.28.dist-info}/METADATA

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

{atomicshop-2.9.26.dist-info → atomicshop-2.9.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=4VWTt9muYXidEh5ZGKpRi0E3fmmoOQXvSn8k3L0EfzI,123
+atomicshop/__init__.py,sha256=AI9-pSv-wHAVsqcfmuGziP6-kJEuPUTy9Hf2ngGpdYI,123
 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
@@ -22,7 +22,7 @@ atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw
 atomicshop/ip_addresses.py,sha256=Hvi4TumEFoTEpKWaq5WNF-YzcRzt24IxmNgv-Mgax1s,1190
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
-atomicshop/permissions.py,sha256=An48413FO1RzvcKa_62rNxcw8RQY411O9Zdm_wNAI9s,2611
+atomicshop/permissions.py,sha256=y63kcxU6GAmnVXqWhs_N29XorOD2xYWlK_CjZ1PpHgA,2897
 atomicshop/print_api.py,sha256=DhbCQd0MWZZ5GYEk4oTu1opRFC-b31g1VWZgTGewG2Y,11568
 atomicshop/process.py,sha256=SXaqG8pzNkHvppPhuhixEIXSaqbeDlTUFLaS5bYSp54,14176
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
@@ -154,7 +154,7 @@ atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute
 atomicshop/wrappers/ctyping/process_winapi.py,sha256=QcXL-ETtlSSkoT8F7pYle97ubGWsjYp8cx8HxkVMgAc,2762
 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=nXfQwaxcHLzqopfD25_I_dxhgBL27yuKWJ1ZeLZ9eyA,3181
+atomicshop/wrappers/dockerw/install_docker.py,sha256=RyrYCHoRexzPjtBK9Qz1apWrbKLAI3DKOfJRztZFIMY,3629
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=XJMKKfDrUq9ZKxYnQ-xFJxSA51z31Nn4eB8_n_hryVk,800
 atomicshop/wrappers/elasticsearchw/elasticsearchw.py,sha256=7TqFdEFznO8NlligJhEKk1vm641ALpCYdaRl1uoXdzM,9768
@@ -230,8 +230,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.9.26.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.9.26.dist-info/METADATA,sha256=is0DdDCUhj9m0AX9TrAnH55FmackAnOuP9xDoNBcNig,10423
-atomicshop-2.9.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.9.26.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.9.26.dist-info/RECORD,,
+atomicshop-2.9.28.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.9.28.dist-info/METADATA,sha256=3VX-U9jIYQ5eLrRA5A1Xlfieud8DJlHNYnZj4l2U8e8,10423
+atomicshop-2.9.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.9.28.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.9.28.dist-info/RECORD,,