From 2a36e3cccf1213b7f2c2d6afdc8ba7ae07475452 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Nov 2016 18:24:10 +0000 Subject: move modechanging variables into libvasile --- binmode | 4 ---- libvasile | 7 +++++++ mixedmode | 4 ---- resetmode | 4 ---- srcmode | 4 ---- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/binmode b/binmode index 36c2670..2ee6d06 100755 --- a/binmode +++ b/binmode @@ -1,9 +1,5 @@ #!/usr/bin/env bash -export local portagedir="/usr/portage" -export local confdir="/etc/portage" -export local gitdir="/opt/redcore-build/conf/intel/portage" - fetch_usermode_portage_tree() { if [[ ! -d "$portagedir"/.git ]] ; then cd "$portagedir" && git init > /dev/null 2>&1 diff --git a/libvasile b/libvasile index 5c2087e..37477ca 100755 --- a/libvasile +++ b/libvasile @@ -49,6 +49,13 @@ export local isosyncdir=""$isorootdir"/rootfs" export local isobootdir=""$isorootdir"/boot/grub" export local isoefibootdir=""$isorootdir"/efi/boot" +# modechange variables + +export local portagedir="/usr/portage" +export local confdir="/etc/portage" +export local gitdir="/opt/redcore-build/conf/intel/portage" +export local clonedir="/opt/redcore-build" + # generic functions (used for both build && iso creation) kernelconfig () { diff --git a/mixedmode b/mixedmode index fab1bc2..a24a024 100755 --- a/mixedmode +++ b/mixedmode @@ -1,9 +1,5 @@ #!/usr/bin/env bash -export local portagedir="/usr/portage" -export local confdir="/etc/portage" -export local gitdir="/opt/redcore-build/conf/intel/portage" - fetch_devmode_portage_tree() { if [[ ! -d "$portagedir"/.git ]] ; then cd "$portagedir" && git init > /dev/null 2>&1 diff --git a/resetmode b/resetmode index 697ecfe..6268998 100755 --- a/resetmode +++ b/resetmode @@ -1,9 +1,5 @@ #!/usr/bin/env bash -export local portagedir="/usr/portage" -export local confdir="/etc/portage" -export local clonedir="/opt/redcore-build" - empty_portage_tree() { if [ -d ""$portagedir"/.git" ] ; then find "$portagedir" -mindepth 1 -name "packages" -prune -o -name "distfiles" -prune -o -exec rm -rf {} \; > /dev/null 2>&1 diff --git a/srcmode b/srcmode index 8fa7529..875dc9c 100755 --- a/srcmode +++ b/srcmode @@ -1,9 +1,5 @@ #!/usr/bin/env bash -export local portagedir="/usr/portage" -export local confdir="/etc/portage" -export local gitdir="/opt/redcore-build/conf/intel/portage" - fetch_devmode_portage_tree() { if [[ ! -d "$portagedir"/.git ]] ; then cd "$portagedir" && git init > /dev/null 2>&1 -- cgit v1.2.3