diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a3d6cd8..be52c77 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1898,8 +1898,15 @@ __overwriteconfig() { tempfile="/tmp/salt-config-$$" fi + # If python does not have yaml installed we're on Arch and should use python2 + if python -c "import yaml" 2> /dev/null; then + good_python=python + else + good_python=python2 + fi + # Convert json string to a yaml string and write it to config file. Output is dumped into tempfile. - python -c "import json; import yaml; jsn=json.loads('$json'); yml=yaml.safe_dump(jsn, line_break='\n', default_flow_style=False); config_file=open('$target', 'w'); config_file.write(yml); config_file.close();" 2>$tempfile + $good_python -c "import json; import yaml; jsn=json.loads('$json'); yml=yaml.safe_dump(jsn, line_break='\n', default_flow_style=False); config_file=open('$target', 'w'); config_file.write(yml); config_file.close();" 2>$tempfile # No python errors output to the tempfile if [ ! -s "$tempfile" ]; then