merge

2 files changed, 10 insertions, 4 deletions

diff --git a/bin/bootstrap b/bin/bootstrap
index 97bf94b..7609ed8 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -13,8 +13,8 @@ mkdir -p ~/var/tmp/incoming
 if ( ! which hg &> /dev/null) {
 	echo 'Mercurial not found, fetching...'
 	cd ~/packages
-	ssh derf.homelinux.org 'tar cz -C ~/var/packages_root mercurial-bin' | tar xz
-	HG="$HOME/packages/mercurial-bin/mercurial-1.0.1/hg"
+	ssh derf.homelinux.org 'tar cz -C ~/var/packages_root .mercurial-bin' | tar xz
+	HG="$HOME/packages/.mercurial-bin/mercurial-1.0.1/hg"
 }
 
 # Fetch the core package, containing checklinks and pkg
@@ -25,5 +25,7 @@ $HG clone ssh://derf.homelinux.org/var/packages_root/core
 # Create symlinks for pkg and checklinks
 cd core
 bin/checklinks
-cd ~/packages/mercurial-bin
-~/bin/checklinks
+if ([ -d $HOME/packages/.mercurial-bin ]) {
+	cd ~/packages/.mercurial-bin
+	~/bin/checklinks
+}
diff --git a/bin/pkg b/bin/pkg
index dde37a8..b61c3e0 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -180,6 +180,10 @@ pkg_info () {
 	echo $LOG | grep -m1 'date:' | grep -Eo '[A-Z][a-z]{2}.*'
 	info "repo size: "
 	du -sh .hg | grep -o '.*[KMG]'
+	if ([ -d hooks ]) {
+		info "Hooks: "
+		ls hooks
+	}
 	if ([ -r .deps ]) {
 		info "Dependencies:\n"
 		cat .deps