Skip to content

GitLab

Commit 7a4489f9 authored by tbrehm's avatar tbrehm
Browse files
Options

Implemented: FS#1101 - Use relative paths for symlinks to enable modules.

parent 54396bab
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 4 deletions
install/lib/installer_base.lib.php
View file @ 7a4489f9
......@@ -1242,9 +1242,15 @@ class installer_base {
$module_name = substr($file,0,-8);
$tmp = new $module_name;
if($tmp->onInstall()) {
if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) {
// @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
@symlink($install_dir.'/server/mods-available/'.$file, '../mods-enabled/'.$file);
}
if (strpos($file, '_core_module') !== false) {
if(!@is_link($install_dir.'/server/mods-core/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file);
if(!@is_link($install_dir.'/server/mods-core/'.$file)) {
//@symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file);
@symlink($install_dir.'/server/mods-available/'.$file, '../mods-core/'.$file);
}
}
}
unset($tmp);
......@@ -1263,9 +1269,15 @@ class installer_base {
$plugin_name = substr($file,0,-8);
$tmp = new $plugin_name;
if(method_exists($tmp,'onInstall') && $tmp->onInstall()) {
if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) {
// @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
@symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-enabled/'.$file);
}
if (strpos($file, '_core_plugin') !== false) {
if(!@is_link($install_dir.'/server/plugins-core/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file);
if(!@is_link($install_dir.'/server/plugins-core/'.$file)) {
// @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file);
@symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-core/'.$file);
}
}
}
unset($tmp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment