dekshell 0.2.43__py3-none-any.whl → 0.2.45__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -100,37 +100,60 @@ def _remove_path(path):
             _remove_path(item)
 
 
-_eval_default = object()
+_default_value = object()
 
 
-def _eval_mixin(expression, default=_eval_default, translate=False):
-    context = get_inner_vars('__inner_context__', full=True)
+def _parse_expression(expression, default=_default_value, translate=False):
+    context = get_inner_vars('__inner_context__')
+    try:
+        return MarkerBase.parse_expression(context, expression, translate)
+    except NameError:
+        if default is _default_value:
+            raise
+        else:
+            return default
+
+
+def _eval_mixin(expression, default=_default_value, translate=False):
+    context = get_inner_vars('__inner_context__')
     try:
         return MarkerBase.eval_mixin(context, expression, translate)
     except NameError:
-        if default is _eval_default:
+        if default is _default_value:
             raise
         else:
             return default
 
 
-def _eval_lines(expression, default=_eval_default):
-    context = get_inner_vars('__inner_context__', full=True)
+def _eval_lines(expression, default=_default_value):
+    context = get_inner_vars('__inner_context__')
     try:
         return MarkerBase.eval_lines(context, expression)
     except NameError:
-        if default is _eval_default:
+        if default is _default_value:
             raise
         else:
             return default
 
 
 def _global_update(variables):
-    context = get_inner_vars('__inner_context__', full=True)
+    context = get_inner_vars('__inner_context__')
     for k, v in variables.items():
         MarkerBase.set_var_raw(context, k, v)
 
 
+def _env_update(variables):
+    context = get_inner_vars('__inner_context__')
+    for k, v in variables.items():
+        context.add_env(k, v)
+
+
+def _envs_update(variables):
+    context = get_inner_vars('__inner_context__')
+    for k, v in variables.items():
+        context.environ.add_item(k, v)
+
+
 def _defined(name):
     default = object()
     return _eval_mixin(name, default=default) is not default
@@ -198,7 +221,7 @@ def _time_mark(begin=True, name=None):
     if name is None:
         name = ''
     name = str(name).strip()
-    marker_set = get_inner_vars('__inner_marker_set__', full=True)
+    marker_set = get_inner_vars('__inner_marker_set__')
     _now = time.time_ns()
     if begin:
         marker_set.vars.add_item(var_prefix + name, _now)
@@ -245,10 +268,21 @@ default_methods = {
         'timeout': shell_timeout,
         'retry': shell_retry,
         'run': shell_wrapper,
+        'env': {
+            None: lambda k, v: _env_update({k: v}),
+            'update': _env_update,
+        },
+        'envs': {
+            None: lambda k, v: _envs_update({k: v}),
+            'update': _envs_update,
+        },
+        'expr': _parse_expression,
         'eval': _eval_mixin,
         'exec': _eval_lines,
-        'update': _global_update,
-        'assign': lambda k, v: _global_update({k: v}),
+        'var': {
+            None: lambda k, v: _global_update({k: v}),
+            'update': _global_update,
+        },
         'invoke': lambda __placeholder__filepath, *args, **kwargs: InvokeMarker.execute_file(
             None, __placeholder__filepath, args, kwargs),
         'goto': lambda __placeholder__filepath, *args, **kwargs: GotoMarker.execute_file(

dekshell/core/contexts/properties.py

@@ -44,37 +44,36 @@ is_on_win = os.name == "nt"
 path_root = path_home[:path_home.find(os.sep)] if is_on_win else os.sep
 
 
-class _Env:
-    def __getattr__(self, item):
-        return os.environ.get(item.upper(), '')
-
-    def __getitem__(self, item):
-        return os.environ[item.upper()]
-
-    def __contains__(self, item):
-        return item.upper() in os.environ
+class _EnvBase:
+    __getenv__ = None
 
-
-class _EnvS:
     def __getattr__(self, item):
-        context = get_inner_vars('__inner_context__', full=True)
-        return context.get_env_full(item.upper(), '')
+        context = get_inner_vars('__inner_context__')
+        return getattr(context, self.__getenv__)(item.upper(), '')
 
     def __getitem__(self, item):
-        context = get_inner_vars('__inner_context__', full=True)
+        context = get_inner_vars('__inner_context__')
         default = object()
-        ret = context.get_env_full(item.upper(), default)
+        ret = getattr(context, self.__getenv__)(item.upper(), default)
         if ret is default:
             raise KeyError(item)
         return ret
 
     def __contains__(self, item):
-        context = get_inner_vars('__inner_context__', full=True)
+        context = get_inner_vars('__inner_context__')
         default = object()
-        ret = context.get_env_full(item.upper(), default)
+        ret = getattr(context, self.__getenv__)(item.upper(), default)
         return ret is not default
 
 
+class _Env(_EnvBase):
+    __getenv__ = 'get_env'
+
+
+class _EnvS(_EnvBase):
+    __getenv__ = 'get_env_full'
+
+
 default_properties = {
     'meta': {
         'name': package_name,

dekshell/core/markers/__init__.py

@@ -26,9 +26,9 @@ def generate_markers(*args, **kwargs):
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
         InputMarker, InputOnceMarker,
         DelVarMarker,
-        ExecLinesUpdateMarker, ExecLinesMarker, ExecTranslatorMarker, ExecMarker, ExecCmdcallSimpleLinesMarker,
-        ExecCmdcallLinesMarker,
-        ExecCmdcallMarker, ExecCmdcallChainMarker,
+        ExecLinesUpdateMarker, ExecLinesTranslatorMarker, ExecLinesMarker, ExecTranslatorMarker, ExecMarker,
+        ExecCommandOutputChainMarker,
+        ExecCmdcallSimpleLinesMarker, ExecCmdcallLinesMarker, ExecCmdcallMarker, ExecCmdcallChainMarker,
         EnvShellMarker, EnvMarker,
         IfMarker, IfElifMarker, IfElseMarker,
         WhileMarker, WhileElseMarker,
@@ -50,7 +50,7 @@ def generate_markers(*args, **kwargs):
         AssignRetryMarker,
         AssignExecMarker, AssignTranslatorEvalMarker, AssignEvalMarker,
         AssignCommandRcSilenceMarker, AssignCommandRcMarker, AssignCommandOutputMarker,
-        AssignEncodeStrMarker, AssignDecodeMarker, AssignEncodeMarker,
+        AssignDecodeMarker, AssignEncodeMarker,
         AssignEnvMarker, AssignEnvFullMarker, AssignCmdcallMarker, AssignCmdcallChainMarker,
         AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker,
         EmptyMarker,  # must be at the tail

dekshell/core/markers/base/__init__.py

@@ -1,4 +1,3 @@
-import os
 import re
 import functools
 from dektools.str import deep_format, split_table_line, shlex_split, shlex_quote
@@ -30,7 +29,6 @@ class MarkerBase:
     trans_marker_command_rc_silence = '<<<'
     trans_marker_command_rc = '<<'
     trans_marker_command_output = '<'
-    trans_marker_encode_str = '///'
     trans_marker_decode = '//'
     trans_marker_encode = '/'
     trans_marker_env = '$$'
@@ -171,7 +169,7 @@ class MarkerBase:
                     change += 1
                 if change in (0, 2):
                     break
-            value = cls.parse_expression(context, expression, ignore_errors)
+            value = cls.parse_expression(context, expression, False, False, ignore_errors)
             if as_var:
                 return context.add_variable_temp(value)
             return value
@@ -183,10 +181,10 @@ class MarkerBase:
             re.escape(cls.trans_marker__end), handler, cls.trans_marker__escape)
 
     @classmethod
-    def parse_expression(cls, context, expression, ignore_errors=False):
+    def parse_expression(cls, context, expression, translate_eval=True, translate_others=True, ignore_errors=False):
         def evaluate(expr, default):
             try:
-                return cls.eval_mixin(context, expr, False)
+                return cls.eval_mixin(context, expr, translate_eval)
             except NameError:
                 if ignore_errors:
                     return default
@@ -198,22 +196,29 @@ class MarkerBase:
 
         if expression.startswith(cls.trans_marker_command_rc_silence):
             expression = expression[len(cls.trans_marker_command_rc_silence):]
+            if translate_others:
+                expression = cls.translate_case(context, expression, True)
             return shell_exitcode(expression, env=context.environ_full())
         elif expression.startswith(cls.trans_marker_command_rc):
             expression = expression[len(cls.trans_marker_command_rc):]
+            if translate_others:
+                expression = cls.translate_case(context, expression, True)
             return shell_wrapper(expression, check=False, env=context.environ_full())
         elif expression.startswith(cls.trans_marker_command_output):
             expression = expression[len(cls.trans_marker_command_output):]
+            if translate_others:
+                expression = cls.translate_case(context, expression, True)
             return shell_output(expression, env=context.environ_full())
         elif expression.startswith(cls.trans_marker_env):
             expression = expression[len(cls.trans_marker_env):]
+            if translate_others:
+                expression = cls.translate_case(context, expression, True)
             return context.get_env(expression.strip(), default_value)
         elif expression.startswith(cls.trans_marker_env_full):
             expression = expression[len(cls.trans_marker_env_full):]
+            if translate_others:
+                expression = cls.translate_case(context, expression, True)
             return context.get_env_full(expression.strip(), default_value)
-        elif expression.startswith(cls.trans_marker_encode_str):
-            expression = expression[len(cls.trans_marker_encode_str):]
-            return serializer.dump(expression)
         elif expression.startswith(cls.trans_marker_decode):
             expression = expression[len(cls.trans_marker_decode):]
             value = evaluate(expression, empty_value)
@@ -435,13 +440,28 @@ class TransformerMarker(MarkerBase):
 class MarkerWithEnd(MarkerBase):
     tag_tail = EndMarker
 
-    def get_inner_content(self, context, marker_node, sep='\n', translate=None):
+    def get_inner_content(self, context, marker_node, sep='\n', translate=None, code=False):
         def walk(node, depth):
             if depth != 0:
                 commands.append(self.translate_case(context, node.text_content, translate))
 
         commands = []
         marker_node.walk(walk)
+        if code:
+            if commands:
+                c = commands[0]
+                cc = c.lstrip()
+                tabs = c[:len(c) - len(cc)]
+                result = []
+                for index, line in enumerate(commands):
+                    if not line.startswith(tabs) and line.lstrip():
+                        raise ValueError(
+                            f'Code indent error:\n'
+                            f'lineno=>{marker_node.line_number + index + 1}\n'
+                            f'translated-line=>{line}'
+                        )
+                    result.append(line[len(tabs):])
+                commands = result
         return sep.join(commands)
 
     def eval_codes(self, context, code):

dekshell/core/markers/base/core.py

@@ -7,7 +7,7 @@ from dektools.typing import NoneType
 from . import MarkerBase, TransformerMarker, ExitException, QuitContextException
 
 
-def get_inner_vars(*var_name_list, full=False):
+def get_inner_vars(*var_name_list, full=True):
     def walk(attr):
         depth = 1
         while True:
@@ -98,6 +98,14 @@ class MarkerContext:
     def get_env(name, default=None):
         return os.environ.get(name, default)
 
+    @staticmethod
+    def add_env(key, value):
+        os.environ[key] = value
+
+    @staticmethod
+    def remove_env(key):
+        os.environ.pop(key, None)
+
 
 class HiddenVarSet:
     def __init__(self):
@@ -215,8 +223,8 @@ class MarkerNode:
                     raise
                 except Exception as e:
                     sys.stderr.write(f"Execute error {node.marker}:\n\
-                    command=> {node.command if node.command_old is None else node.command_old}\n\
-                    line=> {node.line_number}\n\
+                    command=>{node.command if node.command_old is None else node.command_old}\n\
+                    lineno=>{node.line_number}\n\
                     context=>\n\
                     {context}")
                     raise e from None

dekshell/core/markers/define.py

@@ -12,5 +12,5 @@ class DefineMarker(MarkerNoTranslator):
         except NameError:
             expression = self.get_item(args, 2)
             if expression:
-                result = self.eval_mixin(context, expression)
+                result = self.parse_expression(context, expression)
                 self.set_var_raw(context, var_name, result)

dekshell/core/markers/env.py

@@ -24,9 +24,9 @@ class EnvMarker(MarkerEnvBase):
         if key:
             key = key.upper()
             if value is None:
-                os.environ.pop(key, None)
+                context.remove_env(key)
             else:
-                os.environ[key] = value
+                context.add_env(key, value)
 
 
 class EnvShellMarker(MarkerEnvBase):

dekshell/core/markers/exec.py

@@ -25,7 +25,16 @@ class ExecLinesMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = cmd_call_eval_prefix * 2
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node, translate=False)
+        code = self.get_inner_content(context, marker_node, translate=False, code=True)
+        self.eval_lines(context, code)
+        return []
+
+
+class ExecLinesTranslatorMarker(MarkerWithEnd):
+    tag_head = cmd_call_eval_prefix + cmd_call_eval_trans_prefix
+
+    def execute(self, context, command, marker_node, marker_set):
+        code = self.get_inner_content(context, marker_node, translate=True, code=True)
         self.eval_lines(context, code)
         return []
 
@@ -34,7 +43,7 @@ class ExecLinesUpdateMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = cmd_call_eval_prefix * 3
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node, translate=False)
+        code = self.get_inner_content(context, marker_node, translate=False, code=True)
         context.update_variables(self.eval_lines(context, code))
         return []
 
@@ -52,6 +61,15 @@ class ExecCmdcallChainMarker(ExecCmdcallMarkerBase):
     tag_head = cmd_call_prefix_chain + cmd_call_prefix_simple
 
 
+class MarkerParseExprBase(MarkerBase):
+    def execute(self, context, command, marker_node, marker_set):
+        self.parse_expression(context, command.lstrip())
+
+
+class ExecCommandOutputChainMarker(MarkerParseExprBase):
+    tag_head = MarkerBase.trans_marker_command_output
+
+
 class ExecCmdcallSimpleLinesMarker(MarkerWithEnd):
     command_append_prefix = cmd_call_prefix_simple
     tag_head = cmd_call_prefix_simple * 3

dekshell/core/markers/for_.py

@@ -49,4 +49,4 @@ class ForMarker(MarkerWithEnd, MarkerNoTranslator):
         ]
 
     def get_expression_value(self, context, expression):
-        return self.eval_mixin(context, expression)
+        return self.parse_expression(context, expression)

dekshell/core/markers/function.py

@@ -35,7 +35,7 @@ class Function:
         self.body = body
 
     def __call__(self, *args, **kwargs):
-        context, marker_set = get_inner_vars('__inner_context__', '__inner_marker_set__', full=True)
+        context, marker_set = get_inner_vars('__inner_context__', '__inner_marker_set__')
         context = context.derive().update_variables(self.pack_variables(context, args, kwargs))
         return QuitContext.real(marker_set.node_cls.execute_nodes(context, marker_set, self.body[:])[0])
 
@@ -61,7 +61,7 @@ class ReturnMarker(MarkerNoTranslator):
 
     def execute(self, context, command, marker_node, marker_set):
         args = self.split_raw(command, 1, self.tag_head)
-        self.ret(self.eval_mixin(context, args[1]))
+        self.ret(self.parse_expression(context, args[1]))
 
 
 class RaiseMarker(MarkerBase):

dekshell/core/markers/if_.py

@@ -18,7 +18,7 @@ class MarkerWithJudge(MarkerWithEnd, MarkerNoTranslator):
     def get_condition_result(self, context, expression):
         if not expression:
             return self.empty_expected_value
-        return self.eval_mixin(context, expression)
+        return self.parse_expression(context, expression)
 
 
 class IfElseMarker(MarkerWithJudge):

dekshell/core/markers/input.py

@@ -9,7 +9,7 @@ class InputMarker(MarkerWithEnd, MarkerNoTranslator):
     def execute(self, context, command, marker_node, marker_set):
         command_text = self.get_inner_content(context, marker_node, sep='', translate=True).strip()
         expression = self.split_raw(command, 1, self.tag_head)[1]
-        inputs = self.eval_mixin(context, expression)
+        inputs = self.parse_expression(context, expression)
         rc = shell_with_input(command_text, inputs, env=context.environ_full())
         if rc:
             raise subprocess.CalledProcessError(rc, command_text)

dekshell/core/markers/invoke.py

@@ -17,7 +17,7 @@ class MarkerInvokerBase(MarkerBase):
     @classmethod
     def execute_file(cls, marker_set, filepath, args, kwargs):
         if marker_set is None:
-            marker_set = get_inner_vars('__inner_marker_set__', full=True)
+            marker_set = get_inner_vars('__inner_marker_set__')
         return cls._run_file(marker_set, normal_path(filepath), pack_context_full(args, kwargs))
 
     @classmethod

dekshell/core/markers/var.py

@@ -75,7 +75,7 @@ class AssignExecMarker(MarkerAssignBase, MarkerWithEnd, MarkerNoTranslator):
     tag_head_re_args = cmd_call_eval_prefix * 2
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node, translate=False)
+        code = self.get_inner_content(context, marker_node, translate=False, code=True)
         result = self.eval_codes(context, code)
         args = self.split_raw(command, 1, self.tag_head_re_args)
         self.set_var(context, args, 0, result)
@@ -86,7 +86,7 @@ class MarkerAssignValueParseExprBase(MarkerAssignValueBase):
     tag_head_re_args_raw = None
 
     def get_value(self, context, marker_node, marker_set, expression):
-        return self.parse_expression(context, self.tag_head_re_args_raw + expression)
+        return self.parse_expression(context, self.tag_head_re_args_raw + expression, False)
 
 
 class AssignCommandRcSilenceMarker(MarkerAssignValueParseExprBase):
@@ -104,11 +104,6 @@ class AssignCommandOutputMarker(MarkerAssignValueParseExprBase):
     tag_head_re_args = re.escape(MarkerBase.trans_marker_command_output)
 
 
-class AssignEncodeStrMarker(MarkerAssignValueParseExprBase):
-    tag_head_re_args_raw = MarkerBase.trans_marker_encode_str
-    tag_head_re_args = re.escape(MarkerBase.trans_marker_encode_str)
-
-
 class AssignDecodeMarker(MarkerAssignValueParseExprBase):
     tag_head_re_args_raw = MarkerBase.trans_marker_decode
     tag_head_re_args = re.escape(MarkerBase.trans_marker_decode)

dekshell/core/markers/while_.py

@@ -29,4 +29,4 @@ class WhileMarker(MarkerWithEnd, MarkerNoTranslator):
         expression = command.split(self.tag_head, 1)[-1].strip()
         if not expression:
             return True
-        return self.eval_mixin(context, expression)
+        return self.parse_expression(context, expression)

{dekshell-0.2.43.dist-info → dekshell-0.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.43
+Version: 0.2.45
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.2.43.dist-info → dekshell-0.2.45.dist-info}/RECORD

@@ -1,34 +1,34 @@
-dekshell-0.2.43.dist-info/METADATA,sha256=7_oIag3oGwZRV1DcfxmuNFRmfSzHQRwJYo5ynVNx7Oc,573
-dekshell-0.2.43.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.43.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.45.dist-info/METADATA,sha256=rY4WEtfO49dKer-stqUf8iWB7EDBntXkGVxUfmRIp-s,573
+dekshell-0.2.45.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.45.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
 dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=4oGrhKT_KNtZ17Mm9Lw79pQJPkg00NwpZ_OLaM7x5s8,10897
-dekshell/core/contexts/properties.py,sha256=DCMp008aVpD-xEqrt3N1jftXonP9mVSkd80wFoBaxso,3471
-dekshell/core/markers/__init__.py,sha256=lBVNDy3fTImQn17FLvORA6kKQGrq5t_DIqoXJnJdAAY,2201
-dekshell/core/markers/base/__init__.py,sha256=RrGhwhJlgHXsKYYy2Q2oJAXS7kDOuMiLWwzAwO2j4ng,17007
-dekshell/core/markers/base/core.py,sha256=IM5mZ37k62vHfa457s5_Gh0rVEO6CXH5G4zqTeNm1IY,12399
+dekshell/core/contexts/methods.py,sha256=3Bzfv_t8At5MqR0xD7qT8zye6KQySeXr0HpwuendrdE,11789
+dekshell/core/contexts/properties.py,sha256=TQonN3T_K2cB2uakq_DVVB13B-IFwoM6t2ZkL_OMekw,3365
+dekshell/core/markers/__init__.py,sha256=mK6OiZMWmUTrkAL0Bc1XqRTSb-NNhBgpHb7GLivLAlk,2235
+dekshell/core/markers/base/__init__.py,sha256=uG2r2IWQC8L8R1b8SMVJRJUH3Bj_ACU7AjVZIsI7BWw,18039
+dekshell/core/markers/base/core.py,sha256=SwZuCDYGyhm1HUeeBOjO_SDKRZ7IwQI9at1u6X4pmsE,12556
 dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
 dekshell/core/markers/comment.py,sha256=U1U3Xc4-giTqSEAPa4E_DmilZM9hs9zG-PCJ9nn4y5U,965
-dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4fQ,516
+dekshell/core/markers/define.py,sha256=Xlw_YPOWlmbopVIHhIeAKWSZhHhXmqb3gCbXxvuH4BQ,522
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabAo,79
-dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
-dekshell/core/markers/exec.py,sha256=3yWpaCpASrMwzqVslDNzBaUVL7Lbn-zWMs-dOxUePZU,2744
-dekshell/core/markers/for_.py,sha256=uNOEwyDsjffttEBtUYasdlj7FP_sGnQzWuTV5d5esHY,2142
-dekshell/core/markers/function.py,sha256=lYCfK3SAjBwxmJAanpPAqObY4s1FNvZ15FT32_qkaTc,3855
-dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,1112
-dekshell/core/markers/input.py,sha256=O0yvGtt1uhbpE2gOReLseAmshVpZYMW3zV-OabZt0lw,1182
-dekshell/core/markers/invoke.py,sha256=Gf7Y3anFlpXso7oNxecqPtzKoWhFVn3PZVJ8VIgnKls,1986
+dekshell/core/markers/env.py,sha256=hU6irauFrvsUgK9j6jifosiMn0b6mt3aOf5t9oKhxS4,1160
+dekshell/core/markers/exec.py,sha256=tcKZzTuGH17UOi6dycgHGjX3mHrvjKLj8Bnga38tE7U,3369
+dekshell/core/markers/for_.py,sha256=wQnK3-o0dQl4A2wx8xgs6V2dzgEjEbnt4MML2fh2x8U,2148
+dekshell/core/markers/function.py,sha256=j8Cz4ouBQi_0dT6Q6pfJie-1rfIZuSIcWzGBlsKCSd8,3850
+dekshell/core/markers/if_.py,sha256=UqEnR0X9bKO7hEKol3MJNWXvP7fuJAGt8zwk3xlBCuk,1118
+dekshell/core/markers/input.py,sha256=94SWaeLnwtxRdIn9Ck0IxMZL6vOXVCedUmsp5IPAwWo,1188
+dekshell/core/markers/invoke.py,sha256=ESL2DE9DTaq33AnrXpvEudp1qtoeZFKOhLL12OQpcs0,1975
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
 dekshell/core/markers/redirect.py,sha256=cpTQaXFAuSwprsrhUNP0xTGDmu06HGNQVcwKsETEjas,1981
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
-dekshell/core/markers/var.py,sha256=y7gfEtEKs7x3T95AAUTFN6aG3vFiUMMG_TAjfUJFT6U,7070
-dekshell/core/markers/while_.py,sha256=e7lI5jsIM-qxNHMY_wUyCMvvesdXQibR5Ez2jNO9csc,1195
+dekshell/core/markers/var.py,sha256=lGKhKP7NcKc5f_kiombR1d_d2TyRYfVDa9mcB3MJxOY,6894
+dekshell/core/markers/while_.py,sha256=Q0SaElyXSrxg-wS_rfCcxMsmw9jf-0SgN1ICn860T4A,1201
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
 dekshell/core/redirect.py,sha256=6YCJpG0TkQ4WMt7LBtDD_W1T-C-QkLtGRQw0S60qe54,1058
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,4 +37,4 @@ dekshell/utils/cmd.py,sha256=K9FbXgHcGFchHA58xI0_t4YK4yb8XkWbxsNoztYRx3Y,518
 dekshell/utils/pkg.py,sha256=TgYqRqawoJfjkxt6UAHnp9ttmpjuHiWRFbqxADOS1VE,1337
 dekshell/utils/serializer.py,sha256=aIdF2Wzo-qHmIshv46jn1XD0X66vQ1JFdU-g3ZFbH2w,386
 dekshell/utils/shell.py,sha256=0NoA2-SOOMinbmZZipwzL-npBbzPOdWEfdPVYqq5G5g,92
-dekshell-0.2.43.dist-info/RECORD,,
+dekshell-0.2.45.dist-info/RECORD,,