Make the whole system more flexible (NOT backwards compatible)

 * Split up PKG_ROOT into PKG_PROTO, PKG_USER, PKG_HOST and PKG_PATH
 * Change the fourth list field from PKG_ROOT to the repo's clone uri

It is now possible to host your repos on github, for example.

2 files changed, 6 insertions, 5 deletions

diff --git a/test/main b/test/main
index e78d090..f69f81f 100755
--- a/test/main
+++ b/test/main
@@ -11,10 +11,11 @@ function stringcmp {
 	diff -u <(echo $1) <(echo $2)
 }
 
+mkdir -p /tmp/cttest
 tests=$PWD/test
-test_pdir=$(mktemp -dt pkgdir.XXXXXX)
-test_proot=$(mktemp -dt pkgroot.XXXXXX)
-test_home=$(mktemp -dt pkghome.XXXXXX)
+test_pdir=$(mktemp -d /tmp/cttest/pkgdir.XXXXXX)
+test_proot=$(mktemp -d /tmp/cttest/pkgroot.XXXXXX)
+test_home=$(mktemp -d /tmp/cttest/pkghome.XXXXXX)
 
 export PATH=$PWD/bin:$PATH
 
@@ -31,7 +32,7 @@ source $tests/checklinks
 (source $tests/setup)
 
 echo "# bootstrapping PKG_DIR"
-$test_proot/caretaker/examples/bootstrap $test_proot $test_pdir
+$test_proot/caretaker/examples/bootstrap file '' '' $test_proot $test_pdir
 
 echo "# checking for success"
 [[ -e $test_home/.config/caretaker/caretaker.conf ]]
diff --git a/test/setup b/test/setup
index 41db801..d4193ad 100644
--- a/test/setup
+++ b/test/setup
@@ -1,7 +1,7 @@
 ## vim:ft=zsh
 echo "# setting up PKG_ROOT"
 cd $test_proot
-git clone --quiet ${1-git://git.tabularazor.org/~derf/caretaker} caretaker
+git clone --quiet ${1-git://derf.homelinux.org/caretaker} caretaker
 cp caretaker/examples/pkglist pkglist
 for repo in ra rb rc; (
 	mkdir $repo