From 884086f48f55d27886bc0a24f82e5c2669df7a2d Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Tue, 16 Jun 2009 23:33:41 +0200
Subject: pkg {local-,remote-,}update → pkg update {local,remote,}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/pkg | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'bin')

diff --git a/bin/pkg b/bin/pkg
index 53af6c7..a0d85be 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -755,20 +755,16 @@ function pkg_refresh {
 }
 
 function pkg_update {
-	pkg_update_remote
-	pkg_update_local
-}
-
-function pkg_update_remote {
-	info "Updating remote package list..."
-	list_update_remote
-	clear_line
-}
-
-function pkg_update_local {
-	info "Updating local package list..."
-	list_update_local
-	clear_line
+	if [[ -z $1 || $1 == local ]] {
+		info "Updating local package list"
+		list_update_local
+		clear_line
+	}
+	if [[ -z $1 || $1 == remote ]] {
+		info "Updating remote package list"
+		list_update_remote
+		clear_line
+	}
 }
 
 function pkg_info {
@@ -839,14 +835,12 @@ case $action in
 	info) pkg_info $* ;;
 	install) pkg_add $* ;;
 	list) pkg_list $* ;;
-	local-update) pkg_update_local $* ;;
 	log) pkg_log $* ;;
 	push)
 		(( AUTOUPDATE )) && pkg_update
 		wrap pkg_push "$1" 'Pushing'
 	;;
 	refresh) wrap pkg_refresh "$1" 'Refreshing' ;;
-	remote-update) pkg_update_remote $* ;;
 	remove) pkg_remove $* ;;
 	status) wrap pkg_status "$1" 'Checking package status' ;;
 	update) pkg_update $* ;;
-- 
cgit v1.2.3