janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make, scripts: Now excplicitly calling python2 executable instead of python

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-01-02 13:12:00 +00:00
commit e68d4eb83b
11 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/build.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python -u
#!/usr/bin/python2 -u
# -*- coding: iso-8859-15 -*-
from __future__ import print_function
@ -188,7 +188,7 @@ exclude=args.exclude.split()
proj_base=args.base
target=args.target
projects_py="/usr/bin/python " + my_dir + "/projects.py --prefix " + proj_base + " " + os.getenv('PROJECTS_PY_EXTRA_ARGS', "")
projects_py="/usr/bin/python2 " + my_dir + "/projects.py --prefix " + proj_base + " " + os.getenv('PROJECTS_PY_EXTRA_ARGS', "")
env_exclude=os.getenv('BUILD_EXCLUDE', '')
if len(env_exclude):

7
scripts/pkg-manager.sh
View file

@ -60,6 +60,13 @@ cmd_install()
}
eval run sudo $env -S apt-get $global_opts install "$@"
;;
arch)
[ "$non_interactive" = 1 ] && {
global_opts="$global_opts --noconfirm"
env="$env DEBIAN_FRONTEND=noninteractive"
}
eval run sudo $env -S pacman $global_opts -S "$@"
;;
*)
fatal "Tried to install on unsupported platform \"$ID\""
;;

2
scripts/projects.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python -u
#!/usr/bin/python2 -u
from __future__ import print_function
import sys