commit: 1fe49e110bb9826dfc86e516d08a68c2e2043608
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 00:40:28 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 00:40:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1fe49e11
make cloud-prep.sh more robust
releases/weekly/scripts/cloud-prep.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/releases/weekly/scripts/cloud-prep.sh
b/releases/weekly/scripts/cloud-prep.sh
index 3d60ca9..207e4ae 100644
--- a/releases/weekly/scripts/cloud-prep.sh
+++ b/releases/weekly/scripts/cloud-prep.sh
@@ -59,7 +59,9 @@ etc-update --automode -5
# Clean up portage
emerge --verbose=n --depclean
-eix-update
+if [[ -a /usr/bin/eix ]]; then
+ eix-update
+fi
emaint all -f
eselect news read all
eclean-dist --destructive
@@ -73,5 +75,7 @@ for i in $(find /var/log -type f); do truncate -s 0 $i; done
find /usr/share/man/ -mindepth 1 -maxdepth 1 -path "/usr/share/man/man*"
-prune -o -exec rm -rf {} \;
# fine if this fails, aka non-hardened
-echo 'migraging pax'
-/usr/sbin/migrate-pax -m
+if -a [[ /usr/sbin/migrate-pax ]]; then
+ echo 'migraging pax'
+ /usr/sbin/migrate-pax -m
+fi
