From 996054c82f0aa6260df1acece323ea41b93a410a Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 29 Jul 2011 11:06:26 +0200 Subject: Fix checklinks parameters (they're absolute by default, replace $a_foo by $r_foo) --- bin/checklinks | 9 +++++---- bin/ct | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/checklinks b/bin/checklinks index d9df1a2..e442665 100755 --- a/bin/checklinks +++ b/bin/checklinks @@ -270,10 +270,11 @@ Set the level threshold to show status messages. While reading the links file, replace $I with I. When used in conjuction with ct(1), $package will be set to the current -package's relative path (as seen from $HOME, like C), -$etc will be set to $package/etc (like C) and $pkgdir -will point to the package root (like C). Also, for each of these -parameters, C (like $a_etc) is the corresponding absolute path. +package's absolute path, +$etc will be set to $package/etc (e.g. C<~/packages/caretaker/etc>) and $pkgdir +will point to the package root (e.g. C<~/packages>). Also, for each of these +parameters, C (e.g. $r_etc) is the corresponding relative path as +seen from $HOME. =item B<-q>, B<--quiet> diff --git a/bin/ct b/bin/ct index 8fd73fb..1464c64 100755 --- a/bin/ct +++ b/bin/ct @@ -450,11 +450,11 @@ function run_checklinks { ${self_path}/bin/checklinks ${*} ${CL_OPTIONS} \ --parameter package=${PWD} \ - --parameter a_package=${HOME}/${PWD} \ + --parameter r_package=${PWD#${HOME}} \ --parameter etc=${PWD}/etc \ - --parameter a_etc=${HOME}/${PWD}/etc \ - --parameter pkgdir=${PKG_DIR#${HOME}/} \ - --parameter a_pkgdir=${PKG_DIR} + --parameter r_etc=${PWD#${HOME}}/etc \ + --parameter pkgdir=${PKG_DIR} \ + --parameter r_pkgdir=${PKG_DIR#${HOME}/} } elif [[ -d etc && ${MAGIC_ETC} == 1 ]] { ${self_path}/bin/checklinks --ct-auto ${CL_OPTIONS} ${*} -- cgit v1.2.3