diff options
| -rwxr-xr-x | examples/bootstrap (renamed from include/bootstrap) | 0 | ||||
| -rwxr-xr-x | examples/pkglist (renamed from include/pkglist) | 0 | ||||
| -rw-r--r-- | man/7/caretaker-setup.pod | 4 | ||||
| -rw-r--r-- | man/7/caretaker.pod | 8 | ||||
| -rwxr-xr-x | test/main | 2 | ||||
| -rw-r--r-- | test/setup | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/include/bootstrap b/examples/bootstrap index 6d4013e..6d4013e 100755 --- a/include/bootstrap +++ b/examples/bootstrap diff --git a/include/pkglist b/examples/pkglist index 95696a2..95696a2 100755 --- a/include/pkglist +++ b/examples/pkglist diff --git a/man/7/caretaker-setup.pod b/man/7/caretaker-setup.pod index 00196d1..1ce71b8 100644 --- a/man/7/caretaker-setup.pod +++ b/man/7/caretaker-setup.pod @@ -9,12 +9,12 @@ server which shall from now on host all your packages. Then you need to put the caretaker git repository into F<PKG_ROOT/caretaker> - it's recommended to do this via git clone --bare. -Copy the pkglist script (include/pkglist) to F<PKG_ROOT/pkglist>. +Copy the pkglist script (examples/pkglist) to F<PKG_ROOT/pkglist>. Now you can add your own packages as git repos in PKG_ROOT. To use caretaker with your packages on a machine, download and execute -the bootstrap script (include/bootstrap). +the bootstrap script (examples/bootstrap). =head1 CREATING A PACKAGE diff --git a/man/7/caretaker.pod b/man/7/caretaker.pod index 37ad1ac..488a870 100644 --- a/man/7/caretaker.pod +++ b/man/7/caretaker.pod @@ -52,7 +52,7 @@ the package directory $PKG_DIR, except that it neither contains .list nor .list-remote. It is the central point where caretaker fetches packages from and pushes packages to. -It should contain the pkglist script shipped in include/. +It should contain the pkglist script shipped in examples/. If it doesn't, PKGLIST_PATH in .caretaker.conf must be set to the appropiate location on the package root host. @@ -72,7 +72,7 @@ is the package root to which this package belongs. Example: caretaker git 82d716d01dee0329af7df5e67b55558fe3ff1466 git://git.tabularazor.org/~derf The package list is generated by the script set in the config var $PKGLIST_PATH, -by default F<include/pkglist>. Depending on $PKGLIST_LOCAL and $PKG_ROOT, it +by default F<examples/pkglist>. Depending on $PKGLIST_LOCAL and $PKG_ROOT, it is either executed on the local host or on the remote host containing the package root. The script is always called with $PKG_PATH as the first argument. Its output must only contain valid pkglist lines (see the example above). @@ -111,10 +111,6 @@ Configuration files, not treated specially though Package hooks, see L</"HOOKS"> -=item include/ - -Scripts used by the package that don't belong into B<bin/>. Not treated specially - =item man/ Manual files, separated by section (like man/7/caretaker.pod). @@ -31,7 +31,7 @@ source $tests/checklinks (source $tests/setup) echo "# bootstrapping PKG_DIR" -$test_proot/caretaker/include/bootstrap $test_proot $test_pdir +$test_proot/caretaker/examples/bootstrap $test_proot $test_pdir echo "# checking for success" [[ -e $test_home/.config/caretaker/caretaker.conf ]] @@ -2,7 +2,7 @@ echo "# setting up PKG_ROOT" cd $test_proot git clone --quiet ${1-git://git.tabularazor.org/~derf/caretaker} caretaker -cp caretaker/include/pkglist pkglist +cp caretaker/examples/pkglist pkglist for repo in ra rb rc; ( mkdir $repo cd $repo |