eva-shell 0.2.3__tar.gz → 0.2.5__tar.gz

{eva-shell-0.2.3 → eva-shell-0.2.5}/LICENSE

@@ -184,7 +184,7 @@ Copyright Altertech Group and other contributors, https://www.altertech.com/
 
    Common Clause 1.
   
-      Trademark usage conditions: https://www.eva-ics.com/doc?p=trademarks
+      Trademark usage conditions: https://info.bma.ai/en/actual/trademarks.html
 
    END OF TERMS AND CONDITIONS
 

{eva-shell-0.2.3 → eva-shell-0.2.5}/PKG-INFO

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

{eva-shell-0.2.3 → eva-shell-0.2.5}/eva4_shell/__init__.py

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

{eva-shell-0.2.3 → eva-shell-0.2.5}/eva4_shell/ap.py

@@ -1387,6 +1387,9 @@ def init_ap():
         p.add_argument('--test',
                        action='store_true',
                        help='install a build marked as test')
+        p.add_argument('--target-version',
+                       metavar='VERSION:BUILD',
+                       help='update to a specific version/build')
 
     sp.add_parser('version', help='core version')
 

{eva-shell-0.2.3 → eva-shell-0.2.5}/eva4_shell/cli.py

@@ -150,7 +150,8 @@ class CLI:
             args += ' --YES'
         exec_cmd('eva-cloud-manager', args)
 
-    def update(self, download_timeout, repository_url, yes, info_only, test):
+    def update(self, download_timeout, repository_url, yes, info_only, test,
+               target_version):
         args = ''
         if current_command.debug:
             args += ' --verbose '
@@ -166,8 +167,20 @@ class CLI:
         if test:
             args += ' --test'
         old_ver = get_node_svc_info()
-        exec_cmd('eva-cloud-manager', args)
-        if not info_only:
+        if target_version:
+            env = {'EVA_UPDATE_FORCE_VERSION': target_version}
+        else:
+            env = None
+        exec_cmd('eva-cloud-manager', args, env=env)
+        if info_only:
+            print()
+            info = get_node_svc_info()
+            print('update other node to the current version:\n')
+            v = f'{info["version"]}:{info["build"]}'
+            print(colored(f'    eva update --target-version {v}',
+                          color='white'))
+            print()
+        else:
             if old_ver != get_node_svc_info():
                 print('Update completed', end='')
                 if common.interactive:

{eva-shell-0.2.3 → eva-shell-0.2.5}/eva4_shell/shell.py

@@ -13,7 +13,7 @@ banner = """     _______    _____       _______________
  /_____/  |___/_/  |_|  /___/\____//____/"""
 
 home_url = "www.eva-ics.com"
-copyright = "(c) 2022 Bohemia Automation"
+copyright = "(c) Bohemia Automation"
 
 dir_eva_default = '/opt/eva4'
 

{eva-shell-0.2.3 → eva-shell-0.2.5}/eva4_shell/tools.py

@@ -173,7 +173,7 @@ def xc(cmd, ps='working', verbose=False):
         raise RuntimeError(f'process exited with the code {p.returncode}')
 
 
-def exec_cmd(cmd, args, search_in='bin', search_system=True):
+def exec_cmd(cmd, args, search_in='bin', search_system=True, env=None):
     check_local_shell()
     c = f'{common.dir_eva}/{search_in}/{cmd}'
     if not os.path.isfile(c) and search_system:
@@ -181,7 +181,13 @@ def exec_cmd(cmd, args, search_in='bin', search_system=True):
         c = shutil.which(cmd)
     if not c:
         raise RuntimeError(f'{cmd} not found')
-    code = os.system(f'{c} {args}')
+    if env is None:
+        ec = ''
+    else:
+        ec = ''
+        for var, value in env.items():
+            ec += f'{var}="{value}" '
+    code = os.system(f'{ec}{c} {args}')
     if code:
         raise RuntimeError(f'{cmd} failed with code {code}')
 

{eva-shell-0.2.3 → eva-shell-0.2.5}/eva_shell.egg-info/PKG-INFO

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

{eva-shell-0.2.3 → eva-shell-0.2.5}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.3'
+__version__ = '0.2.5'
 
 import setuptools