Skip to content

Commit

Permalink
Item9754: cli installer should look for archives wherever the _installer
Browse files Browse the repository at this point in the history
is located.

git-svn-id: http://svn.foswiki.org/branches/Release01x01@9381 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Sep 27, 2010
1 parent 3b45e2e commit 9ec4b61
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions core/tools/extender.pl
Expand Up @@ -255,14 +255,18 @@ sub _loadInstaller {
pub => "$PACKAGES_URL/"
};

use Cwd qw(abs_path);
use File::Basename;
my $fromDir = dirname(abs_path($0));

_inform "Package repository set to $PACKAGES_URL \n";
_inform
" ... locally found installer scripts and archives will be used if available"
" ... locally found installer scripts and archives will be used if available in $fromDir"
if ($reuseOK);

$thispkg =
new Foswiki::Configure::Package( "$installationRoot/", $MODULE, $session,
{ SHELL => 1, USELOCAL => $reuseOK, SIMULATE => $simulate } );
{ SHELL => 1, USELOCAL => $reuseOK, SIMULATE => $simulate, DIR => $fromDir } );
$thispkg->repository($repository);

my ( $rslt, $err ) = $thispkg->loadInstaller()
Expand Down Expand Up @@ -552,6 +556,7 @@ sub install {
exit 0;
}


$reuseOK = ask(
"Do you want to use locally found installer scripts and archives to install $MODULE and any dependencies.\nIf you reply n, then fresh copies will be downloaded from this repository."
) unless ($reuseOK);
Expand Down

0 comments on commit 9ec4b61

Please sign in to comment.