atomicshop 2.11.17__py3-none-any.whl → 2.11.19__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.17'
+__version__ = '2.11.19'

atomicshop/process.py

@@ -167,7 +167,7 @@ def execute_script(
         script: str,
         check: bool = True,
         shell: bool = False,
-        executable: str = None,
+        executable: Union[str, None] = '',
         as_regular_user: bool = False
 ):
     """
@@ -202,7 +202,7 @@ def execute_script(
     :return: None if execution was successful, subprocess.CalledProcessError string if not.
     """
 
-    if not executable:
+    if executable == '':
         if os.name == 'nt':
             executable = 'cmd.exe'
         elif os.name == 'posix':
@@ -211,7 +211,8 @@ def execute_script(
             raise OSError(f'OS not supported: {os.name}')
 
     if as_regular_user:
-        script = f'sudo -u {os.getlogin()} {script}'
+        script = f'su {os.getlogin()} -c "/bin/bash {script}"'
+        # script = f'sudo -u {os.getlogin()} {script}'
 
     try:
         subprocess.run(script, check=check, shell=shell, executable=executable)

atomicshop/wrappers/dockerw/install_docker.py

@@ -139,19 +139,23 @@ def install_docker_ubuntu(
 
         with permissions.temporary_regular_permissions():
             # 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)
+            # process.execute_script('dockerd-rootless-setuptool.sh install', shell=True, as_regular_user=True)
+            process.execute_script('dockerd-rootless-setuptool.sh install', as_regular_user=True, executable=None)
 
-        # # 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
         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(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-2.11.17.dist-info → atomicshop-2.11.19.dist-info}/METADATA

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

{atomicshop-2.11.17.dist-info → atomicshop-2.11.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=65W9znOyxYHP5Y4__UFfMgxtGSnlDtUlWrDiqOIekk4,124
+atomicshop/__init__.py,sha256=tw0P-X8xzPSZ0PgHzXQWIuNJ17jP4tLibzMwzFUk4Dw,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
@@ -24,7 +24,7 @@ atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 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.py,sha256=vBsu1Bc_RQ0zCkz2mQ2GsCCvdEpP4nPdf9OPhrD2-hU,15614
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
 atomicshop/process_poller.py,sha256=WfmwCLALfTYOq8ri0vkPeqq8ruEyA_43DaN--CU2_XY,10854
 atomicshop/python_file_patcher.py,sha256=kd3rBWvTcosLEk-7TycNdfKW9fZbe161iVwmH4niUo0,5515
@@ -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=yqGW1ImnKmjI101mdz-7RFCtE2L6no5WgislbUQ-7bw,7729
+atomicshop/wrappers/dockerw/install_docker.py,sha256=u0U-TlgbDUABGcR1KBi4_qmq0GFdKCZ9QVqchHn1R_Y,7978
 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.17.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.17.dist-info/METADATA,sha256=6DlxfOdvw59KU2uw4wKZR55tvqdp03sb434oEVuwbKY,10448
-atomicshop-2.11.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.17.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.17.dist-info/RECORD,,
+atomicshop-2.11.19.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.19.dist-info/METADATA,sha256=wHtp9i6v0pEgQltvNRDNOW57MCPUfYS5kwjWlNuPufw,10448
+atomicshop-2.11.19.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.19.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.19.dist-info/RECORD,,