atomicshop 2.11.16__py3-none-any.whl → 2.11.18__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.16'
+__version__ = '2.11.18'

atomicshop/permissions.py

@@ -1,5 +1,5 @@
 import os
-import sys
+import pwd
 import stat
 import ctypes
 import contextlib
@@ -102,3 +102,9 @@ def temporary_regular_permissions():
         # Revert to the original effective user and group ID
         os.seteuid(original_euid)
         os.setegid(original_egid)
+
+
+def expand_user_path(user_name, path):
+    pwnam = pwd.getpwnam(user_name)
+    home_dir = pwnam.pw_dir
+    return path.replace("~", home_dir)

atomicshop/wrappers/dockerw/install_docker.py

@@ -141,15 +141,20 @@ def install_docker_ubuntu(
             # After 'get-docker.sh' execution, we will install docker in rootless mode.
             process.execute_script('dockerd-rootless-setuptool.sh install', shell=True, as_regular_user=True)
 
-        # # Start and enable the docker service in user mode.
-        # ubuntu_terminal.start_enable_service_check_availability('docker.service', user_mode=True, sudo=False)
+        # Start and enable the docker service in user mode.
+        ubuntu_terminal.start_enable_service_check_availability('docker.service', user_mode=True, sudo=False)
+        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
-        subprocess.run(['sudo', 'loginctl', 'enable-linger', os.getlogin()], shell=True)
+        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():
-            ubuntu_terminal.add_path_to_bashrc()
+            ubuntu_terminal.add_path_to_bashrc(as_regular_user=True)
+        input("Press Enter to continue...")
 
     if add_current_user_to_docker_group_bool:
         # Check if current user that executed the script is a sudo user. If not, use the current user.

atomicshop/wrappers/ubuntu_terminal.py

@@ -5,6 +5,7 @@ import shutil
 import time
 
 from ..print_api import print_api
+from .. import permissions
 
 
 def install_packages(package_list: list[str]):
@@ -201,11 +202,24 @@ def start_enable_service_check_availability(
             print_api(f"[{service_name}] service is running.", color='green', **(print_kwargs or {}))
 
 
-def add_path_to_bashrc():
-    """Add $HOME/bin to the PATH in .bashrc if it's not already present."""
-    bashrc_path = os.path.expanduser("~/.bashrc")
+def add_path_to_bashrc(as_regular_user: bool = False):
+    """Add $HOME/bin to the PATH in .bashrc if it's not already present.
+    :param as_regular_user: bool, if True, the function will run as a regular user even if executed with sudo.
+    """
+    home_path_bashrc = "~/.bashrc"
+
+    if as_regular_user:
+        # Get the current non-sudo user
+        with permissions.temporary_regular_permissions():
+            current_non_sudo_user = os.getlogin()
+
+        # Get the home path of the current non-sudo user
+        user_bashrc_path = permissions.expand_user_path(current_non_sudo_user, home_path_bashrc)
+    else:
+        user_bashrc_path = os.path.expanduser(home_path_bashrc)
+
     new_path = 'export PATH=$PATH:$HOME/bin\n'
-    with open(bashrc_path, 'r+') as bashrc:
+    with open(user_bashrc_path, 'r+') as bashrc:
         content = bashrc.read()
         if "$HOME/bin" not in content:
             bashrc.write(new_path)

{atomicshop-2.11.16.dist-info → atomicshop-2.11.18.dist-info}/METADATA

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

{atomicshop-2.11.16.dist-info → atomicshop-2.11.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=eAsq_cjIOGhh6JncibhUbypzp2z_j4OpMwx5qdL_uTY,124
+atomicshop/__init__.py,sha256=s0q29AawhObpnNL8y1mxZfE_uwbVj3XwmaPjU7EHTAE,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
@@ -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=y63kcxU6GAmnVXqWhs_N29XorOD2xYWlK_CjZ1PpHgA,2897
+atomicshop/permissions.py,sha256=tKIluW-p3ThLh1H3QEFgPFRVzw5hafAHk9QJ5OOT_0M,3047
 atomicshop/print_api.py,sha256=DhbCQd0MWZZ5GYEk4oTu1opRFC-b31g1VWZgTGewG2Y,11568
 atomicshop/process.py,sha256=_aDmnQBwpQAD6LO5VPGFFQxkywq5gK7m8N9Z_FHwdDo,15535
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
@@ -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=JkWSZOJ1P4af5UPZIAHYxp81KXMis3CDyjKI9RBY1aI,6954
+atomicshop/wrappers/ubuntu_terminal.py,sha256=zKSp5d8aBLHQwFg2P9zYVEM1g5_zp3ctFUs3O9Vh5Bc,7533
 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=SFA2LYVE0uwILGe8SeIRm-3taqEXCWwQNZVNyn-T4UU,7589
+atomicshop/wrappers/dockerw/install_docker.py,sha256=DckJztRHgRKXV5UjfoU5FH2AXxLf8B8z76am5Mb_u9M,7860
 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.16.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.16.dist-info/METADATA,sha256=Bq1ANFEtTCbncyJJmsul1ibe66c7CCRby48oV1Qgk_s,10448
-atomicshop-2.11.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.16.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.16.dist-info/RECORD,,
+atomicshop-2.11.18.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.18.dist-info/METADATA,sha256=Xiosg33Tz5exTD_ccQRgYX-Dlbu7r_XEUApMrl0eOCY,10448
+atomicshop-2.11.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.18.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.18.dist-info/RECORD,,