Skip to content

[5.0] Fixes the cli installer #42116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 4 commits into from
Oct 18, 2023
Merged

[5.0] Fixes the cli installer #42116

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1a3017
exception
dgrammatiko Oct 10, 2023
ec5c8d2
CS
dgrammatiko Oct 10, 2023
6b39d46
Merge branch '5.0-dev' into 5.0-dev-cli-inst
richard67 Oct 14, 2023
11b5f92
Merge branch '5.0-dev' into 5.0-dev-cli-inst
HLeithner Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions libraries/src/Helper/PublicFolderGeneratorHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,18 @@ public function createPublicFolder(string $destinationPath): void
// The API root index.php
$this->createFile($fullDestinationPath . 'api/index.php', str_replace(['{{APPLICATIONPATH}}', '{{DEFINESPATH}}'], ['\'' . DIRECTORY_SEPARATOR . 'api\'', 'dirname(__DIR__)'], $this->indexTemplate));

if (is_dir(JPATH_ROOT . '/images')) {
$this->createSymlink($root . 'images', $destinationPath . 'images', JPATH_ROOT . '/');
}

// Create symlinks for all the local filesystem directories
if (PluginHelper::isEnabled('filesystem', 'local')) {
// Get all the local filesystem directories
if (\defined('_JCLI_INSTALLATION')) {
$localDirectories = [(object)['directory' => 'images']];
} elseif (PluginHelper::isEnabled('filesystem', 'local')) {
$local = PluginHelper::getPlugin('filesystem', 'local');
$localDirectories = (new Registry($local->params))->get('directories', [(object)['directory' => 'images']]);
}

foreach ($localDirectories as $localDirectory) {
if (!is_link($destinationPath . '/' . $localDirectory->directory)) {
$this->createSymlink($root . $localDirectory->directory, $destinationPath . $localDirectory->directory, JPATH_ROOT . '/');
}
// Symlink all the local filesystem directories
foreach ($localDirectories as $localDirectory) {
if (!is_link($destinationPath . '/' . $localDirectory->directory)) {
$this->createSymlink($root . $localDirectory->directory, $destinationPath . $localDirectory->directory, JPATH_ROOT . '/');
}
}
}
Expand Down