diff options
| -rwxr-xr-x | bin/checklinks | 4 | ||||
| -rwxr-xr-x | bin/pkg | 2 | ||||
| -rw-r--r-- | description | 2 | ||||
| -rw-r--r-- | man/1/pkg | 4 | ||||
| -rw-r--r-- | man/7/pkg | 7 | ||||
| -rw-r--r-- | man/7/pkg-setup | 2 |
6 files changed, 8 insertions, 13 deletions
diff --git a/bin/checklinks b/bin/checklinks index 7e44be6..765e5c7 100755 --- a/bin/checklinks +++ b/bin/checklinks @@ -165,8 +165,8 @@ which have a status of "ok" or "absolute", level 2 will filter anything except While reading the links file, replace $I<parameter> with I<value>. When used in conjuction with pkg(1), $package will be set to the current -package's relative path (as seen from $HOME, like C<packages/core>), -and $etc will be set to $package/etc (like C<packages/core/etc>) +package's relative path (as seen from $HOME, like C<packages/pkg>), +and $etc will be set to $package/etc (like C<packages/pkg/etc>) =item B<-q>, B<--quiet> @@ -357,7 +357,7 @@ function list_update_remote { die "remote list update failed\n" \ "-- note --\n" \ "There were recent changes in pkg involving the package root\n\n" \ - "You might want to copy the pkglist script ($PKG_DIR/core/include/pkglist)\n" \ + "You might want to copy the pkglist script ($PKG_DIR/pkg/include/pkglist)\n" \ "into the package root, so that it's available as\n" \ "$PKG_HOST:$PKG_PATH/pkglist\n" "alternatively, set PKGLIST_PATH to the correct value (see pkg.conf(5))\n" diff --git a/description b/description index b5adccd..89bdd85 100644 --- a/description +++ b/description @@ -1,2 +1,2 @@ -The core package +The pkg package Contains the 'pkg' utility itself, 'checklinks' and the 'bootstrap' script. @@ -131,9 +131,9 @@ Note: If you haven't disabled AUTOUPDATE, B<pkg upgrade> will suffice here Push local changes to the packages_root. Note: If you haven't disabled AUTOUPDATE, B<pkg push> will suffice here -=item * B<pkg refresh core> +=item * B<pkg refresh pkg> -'Fake-Upgrade'. Execute the appropiate commands as if the core package had been +'Fake-Upgrade'. Execute the appropiate commands as if the pkg package had been upgraded (useful when you change something but don't want to commit/push yet) =back @@ -51,11 +51,6 @@ The package root should contain the pkglist script shipped in include/. If it doesn't, PKGLIST_PATH in .pkg.conf must be set to the appropiate location on the package root host. -=head2 CAUTION - -The file $PKG_ROOT/core/include/pkglist is used by pkg, so make sure the git -repo is checked out. A regular 'git checkout -f' in the core repo is recommended. - =head1 THE PACKAGE LIST Thi package list lives in the files B<.list> and B<.list-remote> mentioned @@ -68,7 +63,7 @@ It consists of one line per package, each line containing three items separated by a single whitespace. The first item is the package name, the second one the repository type (DVCS), the third the current revision. Example: - core git 82d716d01dee0329af7df5e67b55558fe3ff1466 + pkg git 82d716d01dee0329af7df5e67b55558fe3ff1466 =head1 WHAT IS A PACKAGE? diff --git a/man/7/pkg-setup b/man/7/pkg-setup index 2efd7d3..a6438a1 100644 --- a/man/7/pkg-setup +++ b/man/7/pkg-setup @@ -8,7 +8,7 @@ pkg - Package root setup First, you'll need to create a root directory (from now on PKG_ROOT) on the server which shall from now on host all your packages. -Then you need to put the pkg git repository into F<PKG_ROOT/core> - it's recommended +Then you need to put the pkg git repository into F<PKG_ROOT/pkg> - it's recommended to do this via git clone --bare. Copy the pkglist script (include/pkglist) to F<PKG_ROOT/pkglist>. |