summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-11-18 19:58:02 +0000
committerV3n3RiX <venerix@rogentos.ro>2016-11-18 19:58:02 +0000
commitb51a62d54aa2eb1d69720367dc3a04dd813bbd83 (patch)
treef8dc08159b8c936fe64538b7f405a5be0af0f584
parent806ae119659cddc4eb445b4c296d2a66fba76adc (diff)
rearrange things
-rwxr-xr-xlibvasile16
1 files changed, 8 insertions, 8 deletions
diff --git a/libvasile b/libvasile
index 6d22e92..994eb47 100755
--- a/libvasile
+++ b/libvasile
@@ -292,7 +292,7 @@ makeiso () {
removeportagetree() {
if [ -d ""$portagedir"/.git" ] ; then
- einfo "Removing portage tree"
+ einfo "Removing gentoo portage tree"
find "$portagedir" -mindepth 1 -name "packages" -prune -o -name "distfiles" -prune -o -exec rm -rf {} \; > /dev/null 2>&1
fi
}
@@ -303,7 +303,7 @@ removeoverlays() {
}
removeportageconfig() {
- einfo "Removing "$releasename" buildsystem"
+ einfo "Removing "$releasename"-"$releasetarget" buildsystem"
rm ""$confdir"/make.conf" > /dev/null 2>&1
rm ""$confdir"/make.profile" > /dev/null 2>&1
rm "$confdir" > /dev/null 2>&1
@@ -318,14 +318,14 @@ resetmode () {
fetchportageconfig() {
pushd /opt > /dev/null 2>&1
- einfo "Injecting "$releasename" buildsystem"
+ einfo "Injecting "$releasename"-"$releasetarget" buildsystem"
git clone https://gitlab.com/redcore/redcore-build.git
popd > /dev/null 2>&1
}
fetchfullportagetree() {
if [[ ! -d "$portagedir"/.git ]] ; then
- einfo "Injecting mixedmode/srcmode (full) portage tree"
+ einfo "Injecting mixedmode/srcmode (full) gentoo portage tree"
cd "$portagedir" && git init > /dev/null 2>&1
git remote add origin https://gitlab.com/redcore/portage.git
git pull --depth=1 origin master
@@ -336,7 +336,7 @@ fetchfullportagetree() {
fetchminimalportagetree() {
if [[ ! -d "$portagedir"/.git ]] ; then
- einfo "Injecting binmode (minimal) portage tree"
+ einfo "Injecting binmode (minimal) gentoo portage tree"
cd "$portagedir" && git init > /dev/null 2>&1
git remote add origin https://gitlab.com/redcore/portage.git
git config core.sparsecheckout true
@@ -381,24 +381,24 @@ setsrcmodeconfig () {
binmode() {
resetmode
+ fetchminimalportagetree
fetchoverlays
fetchportageconfig
- fetchminimalportagetree
setbinmodeconfig
}
mixedmode() {
resetmode
+ fetchfullportagetree
fetchoverlays
fetchportageconfig
- fetchfullportagetree
setmixedconfig
}
srcmode() {
resetmode
+ fetchfullportagetree
fetchoverlays
fetchportageconfig
- fetchfullportagetree
setsrcmodeconfig
}