From 2d1581c8169b9ce2d7351886ff6ceca6035ced6e Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 21 Mar 2012 19:55:03 +0000
Subject: Change upgrade functions

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@510 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
---
 zshfunc/upgrade-systems    | 14 +-------------
 zshfunc/upgrade-torproject | 13 +------------
 2 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'zshfunc')

diff --git a/zshfunc/upgrade-systems b/zshfunc/upgrade-systems
index 07d6ba1..5849a84 100644
--- a/zshfunc/upgrade-systems
+++ b/zshfunc/upgrade-systems
@@ -2,16 +2,4 @@
 
 local i
 
-cd
-for i in $HOSTS; do
-	mkdir hosts/$i 2>/dev/null || continue;
-	echo $i;
-	preexec $i;
-	ssh $i -t 'apt-get update &&
-		if [ -e /usr/bin/apt-get.distrib ]; then
-			aptitude dist-upgrade;
-		else
-			apt-get dist-upgrade;
-		fi &&
-		apt-get clean';
-done
+upgrade-all-Generic weasel upgrade-one-weasel $HOSTS
diff --git a/zshfunc/upgrade-torproject b/zshfunc/upgrade-torproject
index 59c551c..631cefd 100644
--- a/zshfunc/upgrade-torproject
+++ b/zshfunc/upgrade-torproject
@@ -2,15 +2,4 @@
 
 local i
 
-cd
-for i in $TORPROJECTHOSTS; do
-	mkdir hosts/$i 2>/dev/null || continue;
-	echo $i;
-	preexec $i;
-	ssh $i -t '
-			sudo apt-get update &&
-			sudo apt-get dist-upgrade &&
-			sudo apt-get clean &&
-			if ! grep "^OK" /var/cache/dsa/nagios/apt; then sudo /usr/sbin/dsa-update-apt-status; fi
-		';
-done
+upgrade-all-Generic tpo upgrade-one-torproject $TORPROJECTHOSTS
-- 
cgit v1.2.3