From e77f752fe98e8458797e413c4373d5dee3c3c93f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Apr 2016 16:45:16 +0100 Subject: rename helper scripts to something more clear --- modereset | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 modereset (limited to 'modereset') diff --git a/modereset b/modereset new file mode 100755 index 0000000..6fad670 --- /dev/null +++ b/modereset @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +reset_current_mode() { + if [ -d /usr/portage/.git ] ; then + rm -rf /usr/portage/* + rm -rf /usr/portage/.git* + rm /etc/portage/make.conf + rm /etc/portage/make.profile + rm /etc/portage + fi +} + +main () { + reset_current_mode +} +main -- cgit v1.2.3 From 3eb274bfcbe5f3d4c234d626d423d85250c1ada9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Apr 2016 17:52:52 +0100 Subject: keep packages dir and distfiles dir intact when switching modes --- modereset | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modereset') diff --git a/modereset b/modereset index 6fad670..b3c8d41 100755 --- a/modereset +++ b/modereset @@ -2,7 +2,9 @@ reset_current_mode() { if [ -d /usr/portage/.git ] ; then - rm -rf /usr/portage/* + for i in "(ls /usr/portage|grep -v packages|grep -v distfiles)"; do + rm -rf $i + done rm -rf /usr/portage/.git* rm /etc/portage/make.conf rm /etc/portage/make.profile -- cgit v1.2.3 From 90eb32f31f8a14858a537b00a3bedff77321a3ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Apr 2016 18:01:44 +0100 Subject: Revert "keep packages dir and distfiles dir intact when switching modes" This reverts commit 3eb274bfcbe5f3d4c234d626d423d85250c1ada9. --- modereset | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'modereset') diff --git a/modereset b/modereset index b3c8d41..6fad670 100755 --- a/modereset +++ b/modereset @@ -2,9 +2,7 @@ reset_current_mode() { if [ -d /usr/portage/.git ] ; then - for i in "(ls /usr/portage|grep -v packages|grep -v distfiles)"; do - rm -rf $i - done + rm -rf /usr/portage/* rm -rf /usr/portage/.git* rm /etc/portage/make.conf rm /etc/portage/make.profile -- cgit v1.2.3 From 8fb6dc9a8dc3c44c69f579d649ddd0afb36c4cce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Apr 2016 18:03:21 +0100 Subject: make use of variables, avoid removal of distfiles and package directories when switching modes --- modereset | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'modereset') diff --git a/modereset b/modereset index 6fad670..84b0d35 100755 --- a/modereset +++ b/modereset @@ -1,12 +1,14 @@ #!/usr/bin/env bash +export local portagedir="/usr/portage" +export local confdir="/etc/portage" + reset_current_mode() { - if [ -d /usr/portage/.git ] ; then - rm -rf /usr/portage/* - rm -rf /usr/portage/.git* - rm /etc/portage/make.conf - rm /etc/portage/make.profile - rm /etc/portage + if [ -d ""$portagedir"/.git" ] ; then + rm -rf $(find "$portagedir" -mindepth 1 | grep -v "distfiles" | grep -v "packages") + rm ""$confdir"/make.conf" + rm ""$confdir"/make.profile" + rm "$confdir" fi } -- cgit v1.2.3 From af26936d648563d8003a1d19fb170b90992fd3bf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Apr 2016 19:33:59 +0100 Subject: fix : greping so many files and feeding them to rm will trigger kernel ARG_MAX when switching from devmode to usermode --- modereset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modereset') diff --git a/modereset b/modereset index 84b0d35..166421e 100755 --- a/modereset +++ b/modereset @@ -5,7 +5,7 @@ export local confdir="/etc/portage" reset_current_mode() { if [ -d ""$portagedir"/.git" ] ; then - rm -rf $(find "$portagedir" -mindepth 1 | grep -v "distfiles" | grep -v "packages") + 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" -- cgit v1.2.3 From 42db0af4dfac231d1d011e830e5451a1236580a7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jul 2016 17:47:07 +0100 Subject: 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 --- modereset | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'modereset') 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 -- cgit v1.2.3