Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-02 19:36:08 +01:00
Code Issues Packages Projects Releases Activity

Improved Grav Core installer

Browse Source
This commit is contained in:
Matias Griese
2019-02-04 22:35:06 +02:00
parent 2b4fdb40fa
commit 8794bff1c4
1 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
classes/gpm.php
View File

@@ -210,7 +210,7 @@ class Gpm
} }
$tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true); $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
$tmp_zip = $tmp_dir . '/Grav-' . uniqid(); $tmp_zip = $tmp_dir . '/Grav-' . uniqid('', false);
if (Response::isRemote($package_file)) { if (Response::isRemote($package_file)) {
$zip = GravGPM::downloadPackage($package_file, $tmp_zip); $zip = GravGPM::downloadPackage($package_file, $tmp_zip);
@@ -219,7 +219,7 @@ class Gpm
} }
if (file_exists($zip)) { if (file_exists($zip)) {
$tmp_source = $tmp_dir . '/Grav-' . uniqid(); $tmp_source = $tmp_dir . '/Grav-' . uniqid('', false);
$extracted = Installer::unZip($zip, $tmp_source); $extracted = Installer::unZip($zip, $tmp_source);
if (!$extracted) { if (!$extracted) {
@@ -243,8 +243,8 @@ class Gpm
Folder::delete($tmp_zip); Folder::delete($tmp_zip);
return Admin::translate('PLUGIN_ADMIN.CANNOT_OVERWRITE_SYMLINKS'); return Admin::translate('PLUGIN_ADMIN.CANNOT_OVERWRITE_SYMLINKS');
} }
Installer::install($zip, GRAV_ROOT,
['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true, 'ignores' => ['tmp','user','vendor']], $extracted); static::upgradeGrav($zip, $extracted);
} else { } else {
$name = GravGPM::getPackageName($extracted); $name = GravGPM::getPackageName($extracted);
@@ -309,7 +309,7 @@ class Gpm
throw new \RuntimeException($e->getMessage()); throw new \RuntimeException($e->getMessage());
} }
$tmp_dir = Admin::getTempDir() . '/Grav-' . uniqid(); $tmp_dir = Admin::getTempDir() . '/Grav-' . uniqid('', false);
Folder::mkdir($tmp_dir); Folder::mkdir($tmp_dir);
$bad_chars = array_merge(array_map('chr', range(0, 31)), ["<", ">", ":", '"', "/", "\\", "|", "?", "*"]); $bad_chars = array_merge(array_map('chr', range(0, 31)), ["<", ">", ":", '"', "/", "\\", "|", "?", "*"]);
@@ -369,15 +369,63 @@ class Gpm
} }
$update = $upgrader->getAssets()['grav-update']; $update = $upgrader->getAssets()['grav-update'];
$tmp = Admin::getTempDir() . '/Grav-' . uniqid(); $tmp = '';//Admin::getTempDir() . '/Grav-' . uniqid('', false);
$file = self::_downloadSelfupgrade($update, $tmp); if ($tmp) {
$file = self::_downloadSelfupgrade($update, $tmp);
$folder = Installer::unZip($file, $tmp . '/zip');
$keepFolder = false;
} else {
// If you make $tmp empty, you can install your local copy of Grav (for testing purposes only).
$file = 'grav.zip';
//$folder = '~/phpstorm/grav-clones/grav';
$folder = '/home/matias/phpstorm/rockettheme/grav-devtools/grav-clones/grav';
$keepFolder = true;
}
Installer::install($file, GRAV_ROOT, ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true]); static::upgradeGrav($file, $folder, $keepFolder);
$errorCode = Installer::lastErrorCode(); $errorCode = Installer::lastErrorCode();
Folder::delete($tmp); if ($tmp) {
Folder::delete($tmp);
}
return !($errorCode & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)); return !(is_string($errorCode) || ($errorCode & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)));
}
private static function upgradeGrav($zip, $folder, $keepFolder = false)
{
static $ignores = [
'assets',
'backup',
'cache',
'images',
'logs',
'tmp',
'user'
];
if (!is_dir($folder)) {
Installer::setError('Invalid source folder');
}
try {
$script = $folder . '/system/install.php';
/** Install $installer */
if ((file_exists($script) && $install = include $script) && is_callable($install)) {
$install($zip);
} else {
Installer::install(
$zip,
GRAV_ROOT,
['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true, 'ignores' => $ignores],
$folder,
$keepFolder
);
}
} catch (\Exception $e) {
Installer::setError($e->getMessage());
}
} }
} }