From 3b334cd7d27c0f5774d60f48b6cb7e295fcccc00 Mon Sep 17 00:00:00 2001 From: Daniel Kinzler Date: Tue, 1 Aug 2006 12:45:43 +0000 Subject: [PATCH] Rewrote installExtension.php; now using "repository" concept, OO design, and no longer patches LocalSettings.php per default. --- maintenance/installExtension.php | 591 ++++++++++++++++++++----------- 1 file changed, 384 insertions(+), 207 deletions(-) diff --git a/maintenance/installExtension.php b/maintenance/installExtension.php index 1fc404d39d..e6bed0b413 100644 --- a/maintenance/installExtension.php +++ b/maintenance/installExtension.php @@ -21,23 +21,287 @@ * @subpackage Maintenance */ -$optionsWithArgs = array( 'target' ); +$optionsWithArgs = array( 'target', 'repository', 'repos' ); require_once( 'commandLine.inc' ); +define('EXTINST_NOPATCH', 0); +define('EXTINST_WRITEPATCH', 6); +define('EXTINST_HOTPATCH', 10); + +class InstallerRepository { + var $path; + + function InstallerRepository( $path ) { + $this->path = $path; + } + + function printListing( ) { + trigger_error( 'override InstallerRepository::printListing()', E_USER_ERROR ); + } + + function getResource( $name ) { + trigger_error( 'override InstallerRepository::getResource()', E_USER_ERROR ); + } + + /*static*/ function makeRepository( $path, $type = NULL ) { + if ( !$type ) { + preg_match( '!(([-+\w]+)://)?.*?(\.[-\w\d.]+)?$!', $path, $m ); + $proto = @$m[2]; + + if( !$proto ) $type = 'dir'; + else if ( ( $proto == 'http' || $proto == 'https' ) + && preg_match( '!([^\w]svn|svn[^\w])!i', $path) ) $type = 'svn'; #HACK! + else $type = $proto; + } + + if ( $type == 'dir' || $type == 'file' ) return new LocalInstallerRepository( $path ); + else if ( $type == 'http' || $type == 'http' ) return new WebInstallerRepository( $path ); + else return new SVNInstallerRepository( $path ); + } +} + +class LocalInstallerRepository extends InstallerRepository { + + function LocalInstallerRepository ( $path ) { + InstallerRepository::InstallerRepository( $path ); + } + + function printListing( ) { + $ff = glob( "{$this->path}/*" ); + if ( $ff === false || $ff === NULL ) { + ExtensionInstaller::error( "listing directory $repos failed!" ); + return false; + } + + foreach ( $ff as $f ) { + $n = basename($f); + + if ( !is_dir( $f ) ) { + if ( !preg_match( '/(.*)\.(tgz|tar\.gz|zip)/', $n, $m ) ) continue; + $n = $m[1]; + } + + print "\t$n\n"; + } + } + + function getResource( $name ) { + $path = $this->path . '/' . $name; + + if ( !file_exists( $path ) || !is_dir( $path ) ) $path = $this->path . '/' . $name . '.tgz'; + if ( !file_exists( $path ) ) $path = $this->path . '/' . $name . '.tar.gz'; + if ( !file_exists( $path ) ) $path = $this->path . '/' . $name . '.zip'; + + return new LocalInstallerResource( $path ); + } +} + +class WebInstallerRepository extends InstallerRepository { + + function WebInstallerRepository ( $path ) { + InstallerRepository::InstallerRepository( $path ); + } + + function printListing( ) { + ExtensionInstaller::note( "listing index from {$this->path}..." ); + + $txt = @file_get_contents( $this->path . '/index.txt' ); + if ( $txt ) { + print $txt; + print "\n"; + } + else { + $txt = file_get_contents( $this->path ); + if ( !$txt ) { + ExtensionInstaller::error( "listing index from {$this->path} failed!" ); + print ( $txt ); + return false; + } + + $ok = preg_match_all( '!]*href\s*=\s*['."'".'"]([^/'."'".'"]+)\.tgz['."'".'"][^>]*>.*?!si', $txt, $m, PREG_SET_ORDER ); + if ( !$ok ) { + ExtensionInstaller::error( "listing index from {$this->path} does not match!" ); + print ( $txt ); + return false; + } + + foreach ( $m as $l ) { + $n = $l[1]; + print "\t$n\n"; + } + } + } + + function getResource( $name ) { + $path = $this->path . '/' . $name . '.tgz'; + return new WebInstallerResource( $path ); + } +} + +class SVNInstallerRepository extends InstallerRepository { + + function SVNInstallerRepository ( $path ) { + InstallerRepository::InstallerRepository( $path ); + } + + function printListing( ) { + ExtensionInstaller::note( "SVN list {$this->path}..." ); + $txt = wfShellExec( 'svn ls ' . escapeshellarg( $this->path ), $code ); + if ( $code !== 0 ) { + ExtensionInstaller::error( "svn list for {$this->path} failed!" ); + return false; + } + + $ll = preg_split('/(\s*[\r\n]\s*)+/', $txt); + + foreach ( $ll as $line ) { + if ( !preg_match('!^(.*)/$!', $line, $m) ) continue; + $n = $m[1]; + + print "\t$n\n"; + } + } + + function getResource( $name ) { + $path = $this->path . '/' . $name; + return new SVNInstallerResource( $path ); + } +} + +class InstallerResource { + var $path; + var $isdir; + var $islocal; + + function InstallerResource( $path, $isdir, $islocal ) { + $this->path = $path; + + $this->isdir= $isdir; + $this->islocal = $islocal; + + preg_match( '!([-+\w]+://)?.*?(\.[-\w\d.]+)?$!', $path, $m ); + + $this->protocol = @$m[1]; + $this->extensions = @$m[2]; + + if ( $this->extensions ) $this->extensions = strtolower( $this->extensions ); + } + + function fetch( $target ) { + trigger_error( 'override InstallerResource::fetch()', E_USER_ERROR ); + } + + function extract( $file, $target ) { + + if ( $this->extensions == '.tgz' || $this->extensions == '.tar.gz' ) { #tgz file + ExtensionInstaller::note( "extracting $file..." ); + wfShellExec( 'tar zxvf ' . escapeshellarg( $file ) . ' -C ' . escapeshellarg( $target ), $code ); + + if ( $code !== 0 ) { + ExtensionInstaller::error( "failed to extract $file!" ); + return false; + } + } + else if ( $this->extensions == '.zip' ) { #zip file + ExtensionInstaller::note( "extracting $file..." ); + wfShellExec( 'unzip ' . escapeshellarg( $file ) . ' -d ' . escapeshellarg( $target ) , $code ); + + if ( $code !== 0 ) { + ExtensionInstaller::error( "failed to extract $file!" ); + return false; + } + } + else { + ExtensionInstaller::error( "unknown extension {$this->extensions}!" ); + return false; + } + + return true; + } + + /*static*/ function makeResource( $url ) { + preg_match( '!(([-+\w]+)://)?.*?(\.[-\w\d.]+)?$!', $url, $m ); + $proto = @$m[2]; + $ext = @$m[3]; + if ( $ext ) $ext = strtolower( $ext ); + + if ( !$proto ) return new LocalInstallerResource( $url, $ext ? false : true ); + else if ( $ext && ( $proto == 'http' || $proto == 'http' || $proto == 'ftp' ) ) return new WebInstallerResource( $url ); + else return new SVNInstallerResource( $url ); + } +} + +class LocalInstallerResource extends InstallerResource { + function LocalInstallerResource( $path ) { + InstallerResource::InstallerResource( $path, is_dir( $path ), true ); + } + + function fetch( $target ) { + if ( $this->isdir ) return ExtensionInstaller::copyDir( $this->path, dirname( $target ) ); + else return $this->extract( $this->path, dirname( $target ) ); + } + +} + +class WebInstallerResource extends InstallerResource { + function WebInstallerResource( $path ) { + InstallerResource::InstallerResource( $path, false, false ); + } + + function fetch( $target ) { + $tmp = wfTempDir() . '/' . basename( $this->path ); + + ExtensionInstaller::note( "downloading {$this->path}..." ); + $ok = copy( $this->path, $tmp ); + + if ( !$ok ) { + ExtensionInstaller::error( "failed to download {$this->path}" ); + return false; + } + + $this->extract( $tmp, dirname( $target ) ); + unlink($tmp); + + return true; + } +} + +class SVNInstallerResource extends InstallerResource { + function SVNInstallerResource( $path ) { + InstallerResource::InstallerResource( $path, true, false ); + } + + function fetch( $target ) { + ExtensionInstaller::note( "SVN checkout of {$this->path}..." ); + wfShellExec( 'svn co ' . escapeshellarg( $this->path ) . ' ' . escapeshellarg( $target ), $code ); + + if ( $code !== 0 ) { + ExtensionInstaller::error( "checkout failed for {$this->path}!" ); + return false; + } + + return true; + } +} + class ExtensionInstaller { var $source; var $target; var $name; var $dir; + var $tasks; function ExtensionInstaller( $name, $source, $target ) { + if ( !is_object( $source ) ) $source = InstallerResource::makeResource( $source ); + $this->name = $name; $this->source = $source; $this->target = realpath( $target ); $this->extdir = "$target/extensions"; $this->dir = "{$this->extdir}/$name"; $this->incpath = "extensions/$name"; + $this->tasks = array(); #TODO: allow a subdir different from "extensions" #TODO: allow a config file different from "LocalSettings.php" @@ -89,7 +353,7 @@ class ExtensionInstaller { if ( !$ff ) return; foreach ( $ff as $f ) { - if ( is_dir( $f ) ) $this->deleteContents( $f ); + if ( is_dir( $f ) && !is_link( $f ) ) $this->deleteContents( $f ); unlink( $f ); } } @@ -100,7 +364,7 @@ class ExtensionInstaller { if ( !file_exists( $d ) ) { $ok = mkdir( $d ); if ( !$ok ) { - $this->error( "failed to create director $d" ); + ExtensionInstaller::error( "failed to create director $d" ); return false; } } @@ -109,8 +373,8 @@ class ExtensionInstaller { if ( $ff === false || $ff === NULL ) return false; foreach ( $ff as $f ) { - if ( is_dir( $f ) ) { - $ok = $this->copyDir( $f, $d ); + if ( is_dir( $f ) && !is_link( $f ) ) { + $ok = ExtensionInstaller::copyDir( $f, $d ); if ( !$ok ) return false; } else { @@ -118,7 +382,7 @@ class ExtensionInstaller { $ok = copy( $f, $t ); if ( !$ok ) { - $this->error( "failed to copy $f to $t" ); + ExtensionInstaller::error( "failed to copy $f to $t" ); return false; } } @@ -126,107 +390,67 @@ class ExtensionInstaller { return true; } + + function setPermissions( $dir, $dirbits, $filebits ) { + if ( !chmod( $dir, $dirbits ) ) ExtensionInstaller::warn( "faield to set permissions for $dir" ); - function fetchExtension( ) { - if ( file_exists( $this->dir ) && glob( $this->dir . "/*" ) - && realpath( $this->source ) != $this->dir ) { - - if ( $this->confirm( "{$this->dir} exists and is not empty.\nDelete all files in that directory?" ) ) { - $this->deleteContents( $this->dir ); - } - else { - return false; - } - } + $ff = glob( $dir . "/*" ); + if ( $ff === false || $ff === NULL ) return false; - preg_match( '!([-\w]+://)?.*?(\.[-\w\d.]+)?$!', $this->source, $m ); - $proto = @$m[1]; - $ext = @$m[2]; - if ( $ext ) $ext = strtolower( $ext ); - - $src = $this->source; - - #TODO: check that the required program is available. - #may be used: tar, unzip, svn - - if ( $proto && $ext ) { #remote file - $tmp = wfTempDir() . '/' . basename( $src ); + foreach ( $ff as $f ) { + $n= basename( $f ); + if ( $n{0} == '.' ) continue; #HACK: skip dot files - $this->note( "fetching {$this->source}..." ); - $ok = copy( $src, $tmp ); + if ( is_link( $f ) ) continue; #skip link - if ( !$ok ) { - $this->error( "failed to download {$src}" ); - return false; + if ( is_dir( $f ) ) { + ExtensionInstaller::setPermissions( $f, $dirbits, $filebits ); + } + else { + if ( !chmod( $f, $filebits ) ) ExtensionInstaller::warn( "faield to set permissions for $f" ); } - - $src = $tmp; - $proto = NULL; } + + return true; + } - if ( $proto ) { #assume SVN repository - $this->note( "SVN checkout of $src..." ); - wfShellExec( 'svn co ' . escapeshellarg( $src ) . ' ' . escapeshellarg( $this->dir ), $code ); + function fetchExtension( ) { + if ( $this->source->islocal && $this->source->isdir && realpath( $this->source->path ) === $this->dir ) { + $this->note( "files are already in the extension dir" ); + return true; + } - if ( $code !== 0 ) { - $this->error( "checkout failed for $src!" ); - return false; - } - } - else { #local file or directory - $src = realpath ( $src ); - - if ( !file_exists( $src ) ) { - $this->error( "file not found: {$this->source}" ); - return false; - } - - if ( $ext === NULL || $ext === '') { #local dir - if ( $src == $this->dir ) { - $this->note( "files are already in the extension dir" ); - return true; - } - - $this->copyDir( $src, $this->extdir ); - } - else if ( $ext == '.tgz' || $ext == '.tar.gz' ) { #tgz file - $this->note( "extracting $src..." ); - wfShellExec( 'tar zxvf ' . escapeshellarg( $src ) . ' -C ' . escapeshellarg( $this->extdir ), $code ); - - if ( $code !== 0 ) { - $this->error( "failed to extract $src!" ); - return false; - } - } - else if ( $ext == '.zip' ) { #zip file - $this->note( "extracting $src..." ); - wfShellExec( 'unzip ' . escapeshellarg( $src ) . ' -d ' . escapeshellarg( $this->extdir ) , $code ); - - if ( $code !== 0 ) { - $this->error( "failed to extract $src!" ); - return false; - } - } + if ( file_exists( $this->dir ) && glob( $this->dir . "/*" ) ) { + if ( $this->confirm( "{$this->dir} exists and is not empty.\nDelete all files in that directory?" ) ) { + $this->deleteContents( $this->dir ); + } else { - $this->error( "unknown file extension: $ext" ); return false; - } + } } + $ok = $this->source->fetch( $this->dir ); + if ( !$ok ) return false; + if ( !file_exists( $this->dir ) && glob( $this->dir . "/*" ) ) { $this->error( "{$this->dir} does not exist or is empty. Something went wrong, sorry." ); return false; } - #TODO: set permissions.... somehow. Copy from extension dir?? + if ( file_exists( $this->dir . '/README' ) ) $this->tasks[] = "read the README file in {$this->dir}"; + if ( file_exists( $this->dir . '/INSTALL' ) ) $this->tasks[] = "read the INSTALL file in {$this->dir}"; + if ( file_exists( $this->dir . '/RELEASE-NOTES' ) ) $this->tasks[] = "read the RELEASE-NOTES file in {$this->dir}"; + + #TODO: configure this smartly...? + $this->setPermissions( $this->dir, 0755, 0644 ); $this->note( "fetched extension to {$this->dir}" ); return true; } - function patchLocalSettings( $nopatch ) { + function patchLocalSettings( $mode ) { #NOTE: if we get a better way to hook up extensions, that should be used instead. - + $f = $this->dir . '/install.settings'; $t = $this->target . '/LocalSettings.php'; @@ -234,11 +458,13 @@ class ExtensionInstaller { #TODO: allow custom installer scripts + sql patches if ( !file_exists( $f ) ) { - $this->note( "" ); - $this->warn( "No install.settings file provided! Please read the instructions and edit LocalSettings.php manually." ); - $this->note( "" ); + $this->warn( "No install.settings file provided!" ); + $this->tasks[] = "Please read the instructions and edit LocalSettings.php manually to activate the extension."; return '?'; } + else { + $this->note( "applying settings patch..." ); + } $settings = file_get_contents( $f ); @@ -249,25 +475,25 @@ class ExtensionInstaller { $settings = str_replace( '{{path}}', $this->incpath, $settings ); - if ( $nopatch ) { - $this->note( "" ); - $this->note( "Automatic patching is off. Please put the following into your LocalSettings.php:" ); - print " \n$settings\n"; - + if ( $mode == EXTINST_NOPATCH ) { + $this->tasks[] = "Please put the following into your LocalSettings.php:" . "\n$settings\n"; + $this->note( "Skipping patch phase, automatic patching is off." ); return true; } - #NOTE: keep php extension for backup file! - $bak = $this->target . '/LocalSettings.install-' . $this->name . '-' . wfTimestamp(TS_MW) . '.bak.php'; - - $ok = copy( $t, $bak ); - - if ( !$ok ) { - $this->warn( "failed to create backup of LocalSettings.php!" ); - return false; - } - else { - $this->note( "created backup of LocalSettings.php at $bak" ); + if ( $mode == EXTINST_HOTPATCH ) { + #NOTE: keep php extension for backup file! + $bak = $this->target . '/LocalSettings.install-' . $this->name . '-' . wfTimestamp(TS_MW) . '.bak.php'; + + $ok = copy( $t, $bak ); + + if ( !$ok ) { + $this->warn( "failed to create backup of LocalSettings.php!" ); + return false; + } + else { + $this->note( "created backup of LocalSettings.php at $bak" ); + } } $localsettings = file_get_contents( $t ); @@ -289,38 +515,38 @@ class ExtensionInstaller { $localsettings = preg_replace( "/\?>\s*$/si", "$newblock?>", $localsettings ); + if ( $mode != EXTINST_HOTPATCH ) { + $t = $this->target . '/LocalSettings.install-' . $this->name . '-' . wfTimestamp(TS_MW) . '.php'; + } + $ok = file_put_contents( $t, $localsettings ); if ( !$ok ) { $this->error( "failed to patch $t!" ); return false; } - else { - $this->note( "successfully patched LocalSettings.php" ); + else if ( $mode == EXTINST_HOTPATCH ) { + $this->note( "successfully patched $t" ); + } + else { + $this->note( "created patched settings file $t" ); + $this->tasks[] = "Replace your current LocalSettings.php with ".basename($t); } return true; } function printNotices( ) { - $files = array(); - - if ( file_exists( $this->dir . '/README' ) ) $files[] = 'README'; - if ( file_exists( $this->dir . '/INSTALL' ) ) $files[] = 'INSTALL'; - - if ( !$files ) { - $this->note( "no information files found in {$this->dir}" ); + if ( !$this->tasks ) { + $this->note( "Installation is complete, no pending tasks" ); } else { $this->note( "" ); - - $this->note( "Please have a look at the following files in {$this->dir}," ); - $this->note( "they may contain important information about {$this->name}." ); - + $this->note( "PENDING TASKS:" ); $this->note( "" ); - foreach ( $files as $f ) { - $this->note ( "\t* $f" ); + foreach ( $this->tasks as $t ) { + $this->note ( "* " . $t ); } $this->note( "" ); @@ -329,110 +555,61 @@ class ExtensionInstaller { return true; } - /* static */ function listRepository( $repos ) { - preg_match( '!([-\w]+://)?.*?(\.[-\w\d.]+)?$!', $repos, $m ); - $proto = @$m[1]; - - #TODO: right now, this basically lists filenames, so it's not terribly useful. - #In future, there should be a "repository + logical name" scheme - - if ( $proto == 'http://' ) { #HTML directory listing - ExtensionInstaller::note( "listing index from $repos..." ); - - $txt = file_get_contents( $repos ); - - $ok = preg_match_all( '!]*href\s*=\s*['."'".'"]([^/'."'".'"]+)['."'".'"][^>]*>.*?!si', $txt, $m, PREG_SET_ORDER ); - if ( !$ok ) { - ExtensionInstaller::error( "listing index from $repos failed!" ); - print ( $txt ); - return false; - } - - foreach ( $m as $l ) { - $n = $l[1]; - - if ( preg_match('!^[./?]!', $n) ) continue; - - ExtensionInstaller::note( "\t$n" ); - } - } - else if ( !$proto ) { #local directory - ExtensionInstaller::note( "listing directory $repos..." ); - - $ff = glob( "$repos/*" ); - if ( $ff === false || $ff === NULL ) { - ExtensionInstaller::error( "listing directory $repos failed!" ); - return false; - } - - foreach ( $ff as $f ) { - $n = basename($f); - - ExtensionInstaller::note( "\t$n" ); - } - } - else { #assume svn - ExtensionInstaller::note( "SVN list $repos..." ); - $txt = wfShellExec( 'svn ls ' . escapeshellarg( $repos ), $code ); - - if ( $code !== 0 ) { - ExtensionInstaller::error( "svn list for $repos failed!" ); - return false; - } - - $ll = preg_split('/(\s*[\r\n]\s*)+/', $txt); - - foreach ( $ll as $line ) { - if ( !preg_match('!^(.*)/$!', $line, $m) ) continue; - - ExtensionInstaller::note( "\t{$m[1]}" ); - } - } - } } -if ( isset( $options['list'] ) ) { - $repos = $options['list']; - if ( $repos === true || $repos === 1 ) { - # Default to SVN trunk. Perhaps change that to use the version of the present install, - # and/or use bundles at an official download location. - $repos = 'http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/'; - } +$tgt = isset ( $options['target'] ) ? $options['target'] : $IP; - ExtensionInstaller::listRepository( $repos ); +$repos = @$options['repository']; +if ( !$repos ) $repos = @$options['repos']; +if ( !$repos ) $repos = @$wgExtensionInstallerRepository; - exit(0); +if ( !$repos && file_exists("$tgt/.svn") && is_dir("$tgt/.svn") ) { + $svn = file_get_contents( "$tgt/.svn/entries" ); + + if ( preg_match( '!url="(.*?)"!', $svn, $m ) ) { + $repos = dirname( $m[1] ) . '/extensions'; + } } -if( !isset( $args[0] ) ) { - die( "USAGE: installExtension.php [options] name [source]\n" . +if ( !$repos ) $repos = 'http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions'; + +if( !isset( $args[0] ) && !$options['list'] ) { + die( "USAGE: installExtension.php [options] [source]\n" . "OPTIONS: \n" . - " --target= mediawiki installation directory\n" . - " --nopatch don't touch LocalSettings.php\n" . - "SOURCE: \n" . - " May be a local file (tgz or zip) or directory.\n" . - " May be the URL of a remote file (tgz or zip).\n" . - " May be a SVN repository\n" + " --list list available extensions. is ignored / may be omitted.\n" . + " --repository repository to fetch extensions from. May be a local directoy,\n" . + " an SVN repository or a HTTP directory\n" . + " --target mediawiki installation directory to use\n" . + " --nopatch don't create a patched LocalSettings.php\n" . + " --hotpatch patched LocalSettings.php directly (creates a backup)\n" . + "SOURCE: specifies the package source directly. If given, the repository is ignored.\n" . + " The source my be a local file (tgz or zip) or directory, the URL of a\n" . + " remote file (tgz or zip), or a SVN path.\n" ); } -$name = $args[0]; +$repository = InstallerRepository::makeRepository( $repos ); -# Default to SVN trunk. Perhaps change that to use the version of the present install, -# and/or use bundles at an official download location. -$defsrc = "http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/" . urlencode($name); +if ( isset( $options['list'] ) ) { + $repository->printListing(); + exit(0); +} -$src = isset ( $args[1] ) ? $args[1] : $defsrc; +$name = $args[0]; -$tgt = isset ( $options['target'] ) ? $options['target'] : $IP; +$src = isset( $args[1] ) ? $args[1] : $repository->getResource( $name ); + +#TODO: detect $source mismatching $name !! -$nopatch = isset( $options['nopatch'] ) || @$wgExtensionInstallerNoPatch; +$mode = EXTINST_WRITEPATCH; +if ( isset( $options['nopatch'] ) || @$wgExtensionInstallerNoPatch ) $mode = EXTINST_NOPATCH; +else if ( isset( $options['hotpatch'] ) || @$wgExtensionInstallerHotPatch ) $mode = EXTINST_HOTPATCH; if ( !file_exists( "$tgt/LocalSettings.php" ) ) { die("can't find $tgt/LocalSettings.php\n"); } -if ( !$nopatch && !is_writable( "$tgt/LocalSettings.php" ) ) { +if ( $mode == EXTINST_HOTPATCH && !is_writable( "$tgt/LocalSettings.php" ) ) { die("can't write to $tgt/LocalSettings.php\n"); } @@ -446,7 +623,7 @@ if ( !is_writable( "$tgt/extensions" ) ) { $installer = new ExtensionInstaller( $name, $src, $tgt ); -$installer->note( "Installing extension {$installer->name} from {$installer->source} to {$installer->dir}" ); +$installer->note( "Installing extension {$installer->name} from {$installer->source->path} to {$installer->dir}" ); print "\n"; print "\tTHIS TOOL IS EXPERIMENTAL!\n"; @@ -457,9 +634,9 @@ if ( !$installer->confirm("continue") ) die("aborted\n"); $ok = $installer->fetchExtension(); -if ( $ok ) $ok = $installer->patchLocalSettings( $nopatch ); +if ( $ok ) $ok = $installer->patchLocalSettings( $mode ); -$ok = $installer->printNotices(); +if ( $ok ) $ok = $installer->printNotices(); -if ( $ok ) $installer->note( "$name extension was installed successfully" ); +if ( $ok ) $installer->note( "$name extension installed." ); ?> -- 2.20.1