pkg check -> pkg refresh, this also obsoletes the pkg eval fiddling

4 files changed, 16 insertions, 17 deletions

diff --git a/bin/pkg b/bin/pkg
index bdfb007..ab4c5f9 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -522,10 +522,12 @@ pkg_status () {
 	}
 }
 
-pkg_check () {
+pkg_refresh () {
 	check_installed $1
 	cd $PDIR/$1
+	populate_collected $1
 	checklinks $CL_OPTIONS
+	triggers+=$1
 }
 
 pkg_update () {
@@ -606,7 +608,6 @@ pkg_log () {
 
 case $1 in
 	add) pkg_add $2 ;;
-	check) wrap pkg_check "$2" "Checking" ;;
 	delete) pkg_remove $2 ;;
 	info) pkg_info $2 ;;
 	install) pkg_add $2 ;;
@@ -615,6 +616,7 @@ case $1 in
 	local-update) pkg_update_local ;;
 	log) pkg_log $2 ;;
 	push) wrap pkg_push "$2" "Pushing" ;;
+	refresh) wrap pkg_refresh "$2" "Refreshing" ;;
 	remote-update) pkg_update_remote ;;
 	remove) pkg_remove $2 ;;
 	status) wrap pkg_status "$2" "Checking package status" ;;
diff --git a/man/1/pkg b/man/1/pkg
index 97176ae..f96b6f7 100644
--- a/man/1/pkg
+++ b/man/1/pkg
@@ -20,11 +20,6 @@ I<action> may be one of:
 
 fetch given I<package> from the package_root and install it
 
-=item B<check> [ I<package> ]
-
-Check dependencies, conflicts and symlinks of I<package>.
-If no argument is given, checks all installed packages
-
 =item B<delete>|B<remove> I<package>
 
 Remove I<package> from the local packages tree
@@ -61,6 +56,11 @@ Show commit history for package
 push new local versions to PKG_ROOT.
 If no argument is given, pushes all installed packages
 
+=item B<refresh> [ I<package> ]
+
+Check prereqs and update symlinks of I<package>.
+If no argument is given, refreshs all installed packages
+
 =item B<remote-update>
 
 Update remote package list
@@ -108,13 +108,10 @@ Get new stuff from the packages_root
 
 Push local changes to the packages_root
 
-=item * B<pkg eval exec_hook core post-update; pkg eval populate_collected core>
-
-Update the core package after local changes ('fake' an update, since this is
-normally done with pkg upgrade and pkg push).
+=item * B<pkg refresh core>
 
-NOTE: As of Wed Oct 8 10:48:22 2008 +0200, this should be done automatically
-whenever neccessary. You probably won't need to do this manually.
+'Fake-Upgrade'. Execute the appropiate commands as if the core package had been
+upgraded (useful when you change something but don't want to commit/push yet)
 
 =back
 
diff --git a/man/7/pkg b/man/7/pkg
index ee7d03c..e0f8e64 100644
--- a/man/7/pkg
+++ b/man/7/pkg
@@ -54,7 +54,7 @@ packages from and pushes packages to.
 =head2 CAUTION
 
 The file $PKG_ROOT/core/include/pkglist is used by pkg, so make sure the git
-rupo is checked out. A regular 'git checkout -f' in the core repo is recommended.
+repo is checked out. A regular 'git checkout -f' in the core repo is recommended.
 
 =head1 WHAT IS A PACKAGE?
 
diff --git a/provides/zsh/completions/_pkg b/provides/zsh/completions/_pkg
index abcb8d1..bae8afa 100644
--- a/provides/zsh/completions/_pkg
+++ b/provides/zsh/completions/_pkg
@@ -9,8 +9,8 @@ typeset expl
 
 function _pkg_action () {
 	_wanted action expl 'action' \
-	compadd add install check delete eval remove info list{,-all} \
-	local-update log push remote-update status update upgrade
+	compadd add install delete eval remove info list{,-all} \
+	local-update log push remote-update refresh status update upgrade
 }
 
 function _pkg_installed () {
@@ -32,7 +32,7 @@ if (( CURRENT == 2 )) {
 	_pkg_action
 } elif (( CURRENT == 3 )) {
 	case ${words[2]} in
-		changelog|check|delete|log|push|remove|status|upgrade)
+		changelog|check|delete|log|push|refresh|remove|status|upgrade)
 			_pkg_installed
 		;;
 		info)