From d07db5932905cb596014f95b29d06991aa788582 Mon Sep 17 00:00:00 2001
From: "D. Johnson" <fenris02@fedoraproject.org>
Date: Sun, 18 Sep 2011 12:13:36 -0500
Subject: minor reordering

---
 README.txt      |  2 +-
 distro-clean.sh | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.txt b/README.txt
index e01ce9d..3c2c7b8 100644
--- a/README.txt
+++ b/README.txt
@@ -24,7 +24,7 @@ curl -s 'http://fedorapeople.org/gitweb?p=fenris02/public_git/cleanup.git;a=blob
 chmod 0700 /root/distro-clean.sh
 
 # Double check your backups exits and are current.
-./distro-clean.sh
+time ./distro-clean.sh
 
 # Inspect the system, review transaction log, ...
 /root/tmp/raising-elephants.sh
diff --git a/distro-clean.sh b/distro-clean.sh
index 92cbaae..92c2b8b 100755
--- a/distro-clean.sh
+++ b/distro-clean.sh
@@ -103,15 +103,6 @@ repoquery --installed --qf "%{nvra} - %{yumdb_info.reason}" \
     echo remove $n
   done > $YSHELL
 
-# Locate installed desktops -- Hack around broken depsolver
-yum grouplist -v \
-  |sed '1,/^Installed/d;/^Available/,$d;s/[^()]*//;s/(//;s/)//;' \
-  |grep desktop \
-  |while read GROUP; do
-    echo "remove @${GROUP}" >> $YSHELL3
-    echo "install @${GROUP}" >> $YSHELL3
-  done
-
 # reinstall duplicate packages, migtht clean them without breaking
 package-cleanup -q --dupes > ${TMPDIR}/DUPLICATE-PACKAGES_${DS}.txt
 [ -s ${TMPDIR}/DUPLICATE-PACKAGES_${DS}.txt ] && \
@@ -131,8 +122,6 @@ install rpmconf
 install yum-plugin-local
 EOT
 
-echo 'run' >> $YSHELL
-
 # Break out non-essential groups so that yum succeeds even on rawhide
 cat ->> $YSHELL2 <<EOT
 install @admin-tools
@@ -147,7 +136,20 @@ install @printing
 install memtest86+
 EOT
 
+# Locate installed desktops -- Hack around broken depsolver
+yum grouplist -v \
+  |sed '1,/^Installed/d;/^Available/,$d;s/[^()]*//;s/(//;s/)//;' \
+  |grep desktop \
+  |while read GROUP; do
+    echo "remove @${GROUP}" >> $YSHELL3
+    echo "install @${GROUP}" >> $YSHELL3
+  done
+
+echo 'distribution-synchronization' >> $YSHELL3
+
+echo 'run' >> $YSHELL
 echo 'run' >> $YSHELL2
+echo 'run' >> $YSHELL3
 
 #
 [ -n "$VERBOSE" ] && echo 'Removing dependency leaves and installing default package sets'
-- 
cgit