eva-shell 0.2.28__tar.gz → 0.2.30__tar.gz

{eva-shell-0.2.28 → eva-shell-0.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.28
+Version: 0.2.30
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva-shell-0.2.28 → eva-shell-0.2.30}/eva4_shell/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.2.28'
+__version__ = '0.2.30'
 
 DEFAULT_REPOSITORY_URL = 'https://pub.bma.ai/eva4'

{eva-shell-0.2.28 → eva-shell-0.2.30}/eva4_shell/cli.py

@@ -1460,7 +1460,7 @@ class CLI:
             if current_command.json:
                 d['ip'] = ip
             else:
-                d.append({'name': 'IP address', 'value': ip})
+                d.append({'name': 'IP addr/host', 'value': ip})
         print_result(d, need_header=False, name_value=False)
 
     def mirror_set(self, mirror_url):

{eva-shell-0.2.28 → eva-shell-0.2.30}/eva4_shell/shell.py

@@ -5,6 +5,7 @@ from neotermcolor import colored
 from .sharedobj import common, current_command
 from .cli import CLI
 from .ap import init_ap
+from .tools import is_local_shell
 
 banner = """     _______    _____       _______________
     / ____/ |  / /   |     /  _/ ____/ ___/
@@ -19,13 +20,22 @@ dir_eva_default = '/opt/eva4'
 
 
 def launch():
-    common.dir_eva = os.environ.get('EVA_DIR', dir_eva_default)
-    if not os.path.exists(common.dir_eva):
-        raise RuntimeError(
-            f'EVA ICS directory not found. Consider installing EVA ICS either '
-            f'in {dir_eva_default} or specifying EVA_DIR env variable')
-    common.bus_path = f'{common.dir_eva}/var/bus.ipc'
-    common.bus_name = f'eva-shell.{os.getpid()}'
+    bus = os.environ.get('EVA_BUS')
+    if bus:
+        common.dir_eva = None
+        common.bus_path = bus
+        import socket
+        common.bus_name = f'eva-shell.{socket.gethostname()}.{os.getpid()}'
+    else:
+        common.dir_eva = os.environ.get('EVA_DIR', dir_eva_default)
+        if not os.path.exists(common.dir_eva):
+            raise RuntimeError(
+                f'EVA ICS directory not found. Consider installing EVA ICS either '
+                f'in {dir_eva_default} or specifying EVA_DIR env variable. '
+                f'For For a remote host, set EVA_BUS=HOST:PORT env variable'
+            )
+        common.bus_path = f'{common.dir_eva}/var/bus.ipc'
+        common.bus_name = f'eva-shell.{os.getpid()}'
 
     common.cli = CLI()
 

{eva-shell-0.2.28 → eva-shell-0.2.30}/eva4_shell/tools.py

@@ -20,7 +20,7 @@ def check_local_shell():
 
 
 def is_local_shell():
-    return True
+    return common.dir_eva is not None
 
 
 def ok():
@@ -93,19 +93,24 @@ def remove_file_lock(name):
 
 
 def get_my_ip():
-    try:
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-        s.connect(('255.255.255.255', 0))
-        ip = s.getsockname()[0]
-        try:
-            s.close()
-        except:
-            pass
-    except:
-        ip = None
-    return ip
-
+    if common.bus_path:
+        if common.bus_path.startswith('/'):
+            try:
+                s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+                s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+                s.connect(('255.255.255.255', 0))
+                ip = s.getsockname()[0]
+                try:
+                    s.close()
+                except:
+                    pass
+            except:
+                ip = None
+            return ip
+        else:
+            return common.bus_path.split(':')[0]
+    else:
+        return ''
 
 TIME_ORD = {
     'created': 0,

{eva-shell-0.2.28 → eva-shell-0.2.30}/eva_shell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.28
+Version: 0.2.30
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva-shell-0.2.28 → eva-shell-0.2.30}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.28'
+__version__ = '0.2.30'
 
 import setuptools