Add passing bash version to read_vars_file (#729)

* Add passing bash version to read_vars_file Signed-off-by: Bolun Thompson <[email protected]> * Add reading bash version in pa.sh, not in python Signed-off-by: Bolun Thompson <[email protected]> --------- Signed-off-by: Bolun Thompson <[email protected]>
binpash · Nov 18, 2024 · d5a3b13 · d5a3b13
1 parent 57747d3
commit d5a3b13
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/compiler/config.py b/compiler/config.py
@@ -38,6 +38,8 @@
 
 SOCKET_BUF_SIZE = 8192
 
+BASH_VERSION = tuple(int(i) for i in os.getenv("PASH_BASH_VERSION").split(" "))
+
 
 ##
 ## Global configuration used by all pash components

diff --git a/compiler/pash_compilation_server.py b/compiler/pash_compilation_server.py
@@ -257,7 +257,7 @@ def compile_and_add(self, compiled_script_file, var_file, input_ir_file):
 
         variable_reading_start_time = datetime.now()
         # Read any shell variables files if present
-        vars_dict = env_vars_util.read_vars_file(var_file)
+        vars_dict = env_vars_util.read_vars_file(var_file, config.BASH_VERSION)
         config.set_vars_file(var_file, vars_dict)
 
         variable_reading_end_time = datetime.now()

diff --git a/compiler/pash_compiler.py b/compiler/pash_compiler.py
@@ -57,7 +57,7 @@ def main_body():
     runtime_config = config.config["distr_planner"]
 
     ## Read any shell variables files if present
-    vars_dict = env_vars_util.read_vars_file(args.var_file)
+    vars_dict = env_vars_util.read_vars_file(args.var_file, config.BASH_VERSION)
     config.set_vars_file(args.var_file, vars_dict)
 
     log("Input:", args.input_ir, "Compiled file:", args.compiled_script_file)

diff --git a/pa.sh b/pa.sh
@@ -31,6 +31,9 @@ then
     exit
 fi
 
+## get bash version for pash
+export PASH_BASH_VERSION="${BASH_VERSINFO[@]:0:3}"
+
 ## Create a temporary directory where PaSh can use for temporary files and logs
 export PASH_TMP_PREFIX="$(mktemp -d /tmp/pash_XXXXXXX)/"
 

diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,4 @@ graphviz
 libdash
 pash-annotations==0.2.2
 shasta==0.1.0
-sh-expand>=0.1.3
+sh-expand>=0.1.6