diff --git a/constructor/winexe.py b/constructor/winexe.py index fb119b924..3e22a9485 100644 --- a/constructor/winexe.py +++ b/constructor/winexe.py @@ -103,6 +103,7 @@ def setup_script_env_variables(info) -> List[str]: + f"""("{name}", {str_esc(value)}).r0'""") return lines + def custom_nsi_insert_from_file(filepath: os.PathLike) -> str: """Insert NSI script commands from file. diff --git a/examples/scripts/post_install.sh b/examples/scripts/post_install.sh index 4f435e038..344274663 100644 --- a/examples/scripts/post_install.sh +++ b/examples/scripts/post_install.sh @@ -15,7 +15,9 @@ echo "PREFIX=${PREFIX}" test "${INSTALLER_NAME}" = "Scripts" test "${INSTALLER_VER}" = "X" +# shellcheck disable=SC2016 # String interpolation disabling is deliberate test "${CUSTOM_VARIABLE_1}" = 'FIR$T CUSTOM '\''STRING'\'' WITH SPACES AND @*! "CHARACTERS"' +# shellcheck disable=SC2016 # String interpolation disabling is deliberate test "${CUSTOM_VARIABLE_2}" = '$ECOND CUSTOM '\''STRING'\'' WITH SPACES AND @*! "CHARACTERS"' if [[ $(uname -s) == Linux ]]; then diff --git a/examples/scripts/pre_install.sh b/examples/scripts/pre_install.sh index ca6ed8e98..413d9eed1 100644 --- a/examples/scripts/pre_install.sh +++ b/examples/scripts/pre_install.sh @@ -12,7 +12,9 @@ echo "PREFIX=${PREFIX}" test "${INSTALLER_NAME}" = "Scripts" test "${INSTALLER_VER}" = "X" +# shellcheck disable=SC2016 # String interpolation disabling is deliberate test "${CUSTOM_VARIABLE_1}" = 'FIR$T CUSTOM '\''STRING'\'' WITH SPACES AND @*! "CHARACTERS"' +# shellcheck disable=SC2016 # String interpolation disabling is deliberate test "${CUSTOM_VARIABLE_2}" = '$ECOND CUSTOM '\''STRING'\'' WITH SPACES AND @*! "CHARACTERS"' if [[ $(uname -s) == Linux ]]; then