Annnd of course we have references to python2 in bash stuff and other misc scripts

This commit is contained in:
Alexandre Aubin 2021-01-10 02:07:24 +01:00
parent c272d20a31
commit a665c702d0
5 changed files with 5 additions and 5 deletions

View file

@ -78,7 +78,7 @@ ynh_app_setting_delete() {
# #
ynh_app_setting() ynh_app_setting()
{ {
ACTION="$1" APP="$2" KEY="$3" VALUE="${4:-}" python2.7 - <<EOF ACTION="$1" APP="$2" KEY="$3" VALUE="${4:-}" python3 - <<EOF
import os, yaml, sys import os, yaml, sys
app, action = os.environ['APP'], os.environ['ACTION'].lower() app, action = os.environ['APP'], os.environ['ACTION'].lower()
key, value = os.environ['KEY'], os.environ.get('VALUE', None) key, value = os.environ['KEY'], os.environ.get('VALUE', None)

View file

@ -421,7 +421,7 @@ ynh_render_template() {
local output_path=$2 local output_path=$2
mkdir -p "$(dirname $output_path)" mkdir -p "$(dirname $output_path)"
# Taken from https://stackoverflow.com/a/35009576 # Taken from https://stackoverflow.com/a/35009576
python2.7 -c 'import os, sys, jinja2; sys.stdout.write( python3 -c 'import os, sys, jinja2; sys.stdout.write(
jinja2.Template(sys.stdin.read() jinja2.Template(sys.stdin.read()
).render(os.environ));' < $template_path > $output_path ).render(os.environ));' < $template_path > $output_path
} }

View file

@ -115,7 +115,7 @@ do_post_regen() {
} }
_update_services() { _update_services() {
python2 - << EOF python3 - << EOF
import yaml import yaml

2
debian/rules vendored
View file

@ -5,7 +5,7 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
%: %:
dh ${@} --with=python2,systemd dh ${@} --with=python3,systemd
override_dh_auto_build: override_dh_auto_build:
# Generate bash completion file # Generate bash completion file

View file

@ -1,4 +1,4 @@
#!/usr/env/python2.7 #!/usr/env/python3
import os import os
import glob import glob