From 1ec93bf69be5d8966cddddf718e3534a749684fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Nov 2018 10:45:01 +0000 Subject: break backward compatibility, remove all modes as they're moved in and handled by sisyphus now --- src/backend/f_modeswitch.sh | 74 +++++++++------------------------------------ 1 file changed, 15 insertions(+), 59 deletions(-) (limited to 'src/backend/f_modeswitch.sh') diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh index d16fa13..7d50d0d 100644 --- a/src/backend/f_modeswitch.sh +++ b/src/backend/f_modeswitch.sh @@ -22,14 +22,7 @@ delportcfgtree () { rm -rf "$jailportvcspath" > /dev/null 2>&1 } -resetmode () { - checkifroot - delmainporttree - deladdonporttree - delportcfgtree -} - -getmainportsrctree () { +getmainporttree () { if [ ! -d ""$jailmainportpath"/.git" ] ; then einfo "I am injecting Gentoo ebuild tree" cd "$jailmainportpath" && git init > /dev/null 2>&1 @@ -40,40 +33,11 @@ getmainportsrctree () { fi } -getmainportbintree () { - if [ ! -d ""$jailmainportpath"/.git" ] ; then - einfo "I am injecting Gentoo ebuild tree" - cd "$jailmainportpath" && git init > /dev/null 2>&1 - git remote add origin https://pagure.io/redcore/portage.git - git config core.sparsecheckout true - echo "profiles/*" >> .git/info/sparse-checkout - echo "metadata/*" >> .git/info/sparse-checkout - echo "eclass/*" >> .git/info/sparse-checkout - git pull --depth=1 origin master - git branch -u origin/master master - rm -rf ""$gentooportdir"/profiles/updates" - fi -} - -getaddonportsrctree () { - if [ ! -d ""$jailaddonportpath"/.git" ] ; then - einfo "I am injecting Redcore ebuild tree" - cd "$jailaddonportpath" && git init > /dev/null 2>&1 - git remote add origin https://pagure.io/redcore/redcore-desktop.git - git pull --depth=1 origin master - git branch -u origin/master master - fi -} - -getaddonportbintree () { +getaddonporttree () { if [ ! -d ""$jailaddonportpath"/.git" ] ; then einfo "I am injecting Redcore ebuild tree" cd "$jailaddonportpath" && git init > /dev/null 2>&1 git remote add origin https://pagure.io/redcore/redcore-desktop.git - git config core.sparsecheckout true - echo "profiles/*" >> .git/info/sparse-checkout - echo "metadata/*" >> .git/info/sparse-checkout - echo "eclass/*" >> .git/info/sparse-checkout git pull --depth=1 origin master git branch -u origin/master master fi @@ -86,18 +50,6 @@ getportcfgtree () { popd > /dev/null 2>&1 } -getsrctree () { - getmainportsrctree - getaddonportsrctree - getportcfgtree -} - -getbintree () { - getmainportbintree - getaddonportbintree - getportcfgtree -} - setmakeconf () { ln -sf "$jailportcfgsource" "$jailportcfgtarget" ln -sf "$jailportcfgtarget"/make.conf.amd64-generic "$jailportcfgtarget"/make.conf @@ -117,17 +69,21 @@ setprofile () { . /etc/profile } -setbinmode () { - resetmode - getbintree - setmakeconf - setmakeopts - setprofile +reset () { + checkifroot + delmainporttree + deladdonporttree + delportcfgtree } -setsrcmode () { - resetmode - getsrctree +setup () { + checkifroot + delmainporttree + deladdonporttree + delportcfgtree + getmainporttree + getaddonporttree + getportcfgtree setmakeconf setmakeopts setprofile -- cgit v1.2.3