always reset mode before switching between usermode and devmode && and always use fresh upstream copy of portage configs so that whatever someone fucks in devmode, usermode is never affected...just switch back and upgrade

2 files changed, 19 insertions, 6 deletions

diff --git a/kvasile b/kvasile
index 6e15b77..0007b2a 100755
--- a/kvasile
+++ b/kvasile
@@ -74,7 +74,7 @@ case $1 in
 					echo -e "--makepkg : build package/target in a clean squashed core"
 					echo -e "--makeiso : build iso based on clean squashed core + targets"
 					echo -e "--usermode : switch INSTALLED Kogaion system to usermode (use binary packages from repositories)"
-					echo -e "--devmode : switch INSTALLED Kogaion system to devmode (use source packages from portage tree )"
+					echo -e "--devmode : switch INSTALLED Kogaion system to devmode (use source packages from portage tree)"
 					echo -e "--help : display this help and exit"
 					echo -e ""
 					;;
diff --git a/modereset b/modereset
index 166421e..e961c6a 100755
--- a/modereset
+++ b/modereset
@@ -2,17 +2,30 @@
 
 export local portagedir="/usr/portage"
 export local confdir="/etc/portage"
+export local gitdir="/opt/kogaion-build"
 
-reset_current_mode() {
+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
-		rm ""$confdir"/make.conf"
-		rm ""$confdir"/make.profile"
-		rm "$confdir"
 	fi
 }
 
+reset_portage_config() {
+	rm ""$confdir"/make.conf"
+	rm ""$confdir"/make.profile"
+	rm "$confdir"
+	rm -rf "$gitdir"
+}
+
+fetch_portage_config() {
+	pushd /opt > /dev/null 2>&1
+	git clone https://gitlab.com/kogaion/kogaion-build.git > /dev/null 2>&1
+	popd > /dev/null 2>&1
+}
+
 main () {
-	reset_current_mode
+	empty_portage_tree
+	reset_portage_config
+	fetch_portage_config
 }
 main