diff options
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/archiso/mythvantage/build.sh | 3 | ||||
| -rwxr-xr-x | build_tools/bin/mp.py | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/build_tools/archiso/mythvantage/build.sh b/build_tools/archiso/mythvantage/build.sh index bf8e2ea..46d35f7 100755 --- a/build_tools/archiso/mythvantage/build.sh +++ b/build_tools/archiso/mythvantage/build.sh @@ -222,7 +222,8 @@ make_customize_root_image() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then cp -af ${script_path}/root-image ${work_dir} chmod 750 ${work_dir}/root-image/etc/sudoers.d - chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel + #JM + #chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel mkdir -p ${work_dir}/root-image/etc/pacman.d #JM #mkdir -p ${work_dir}/storage/data/home diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py index 8062f5c..4df837b 100755 --- a/build_tools/bin/mp.py +++ b/build_tools/bin/mp.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2 -# Version 0.7.4 +# Version 0.7.5 import os import sys @@ -41,9 +41,14 @@ XZPKG = "" # See what git branch we're working under git_repo = Git() branches = git_repo.branch() -git_branch = branches.split('*')[1].lstrip(' ') - -if git_branch == "testing": +git_branch="didnt_find_it" +for i in branches.split("\n"): + if i.strip().startswith("*"): + git_branch = i.split("*")[1].lstrip(' ') + break +print git_branch + +if git_branch == "R7-testing": SFIX = "-testing" elif git_branch == "master": SFIX = "" |