diff --git a/bin/ose b/bin/ose index 237c849794a181397dc7109aa6dadca7ae987816..722291179c680756138c041763664adbd6037010 100755 --- a/bin/ose +++ b/bin/ose @@ -117,7 +117,6 @@ function update(Console $c, OseAdmin $oa) } - function passwordChange(Console $c, OseAdmin $oa) { $c->println("Veuillez saisir un login :"); @@ -140,7 +139,6 @@ function passwordChange(Console $c, OseAdmin $oa) } - function majPublicLinks(Console $c, OseAdmin $oa) { $osedir = dirname(__DIR__); @@ -149,15 +147,14 @@ function majPublicLinks(Console $c, OseAdmin $oa) $res = $oa->majUnicaenSymLinks($osedir); - if ($res){ + if ($res) { $c->println('Liens mis à jour', $c::COLOR_LIGHT_GREEN); - }else{ + } else { $c->println('Liens déjà à jour', $c::COLOR_LIGHT_GREEN); } } - function help(Console $c, OseAdmin $oa) { $actions = [ @@ -213,23 +210,20 @@ class OseAdmin - public function majUnicaenSymLinks($oseDir ): bool + public function majUnicaenSymLinks($oseDir): bool { if (substr($oseDir, -1) !== '/') { $oseDir .= '/'; } - $publicDir = $oseDir . 'public/vendor/unicaen/'; - $unicaenDir = $oseDir . 'vendor/unicaen/'; - $oldLibs = []; - $od = array_filter(glob($publicDir . '*'), 'is_dir'); + $od = array_filter(glob($oseDir . 'public/vendor/unicaen/*'), 'is_dir'); foreach ($od as $dir) { $oldLibs[] = basename($dir); } $newLibs = []; - $nd = array_filter(glob($unicaenDir . '*'), 'is_dir'); + $nd = array_filter(glob($oseDir . 'vendor/unicaen/*'), 'is_dir'); foreach ($nd as $dir) { if (is_dir($dir . '/public')) { $newLibs[] = basename($dir); @@ -240,18 +234,18 @@ class OseAdmin $createLibs = array_diff($newLibs, $oldLibs); foreach ($deleteLibs as $lib) { - $command = "rm $publicDir$lib"; + $command = "rm $oseDir"."public/vendor/unicaen/$lib"; $this->console->print($command); $this->console->exec($command); } foreach ($createLibs as $lib) { - $command = "ln -sf $unicaenDir$lib/public $publicDir$lib"; + $command = "cd $oseDir/public/vendor/unicaen;ln -sf ../../../vendor/unicaen/$lib/public $lib"; $this->console->print($command); $this->console->exec($command); } - return ! (empty($deleteLibs) && empty($createLibs)); + return !(empty($deleteLibs) && empty($createLibs)); } diff --git a/bin/ose-deploy b/bin/ose-deploy index 0523ba709b691c166764c5b2a701aa9e2662d780..2b85eee834814c1cced8fdabaa60d6e1c2be0fe3 100644 --- a/bin/ose-deploy +++ b/bin/ose-deploy @@ -181,23 +181,20 @@ class OseDeploy - public function majUnicaenSymLinks($oseDir ): bool + public function majUnicaenSymLinks($oseDir): bool { if (substr($oseDir, -1) !== '/') { $oseDir .= '/'; } - $publicDir = $oseDir . 'public/vendor/unicaen/'; - $unicaenDir = $oseDir . 'vendor/unicaen/'; - $oldLibs = []; - $od = array_filter(glob($publicDir . '*'), 'is_dir'); + $od = array_filter(glob($oseDir . 'public/vendor/unicaen/*'), 'is_dir'); foreach ($od as $dir) { $oldLibs[] = basename($dir); } $newLibs = []; - $nd = array_filter(glob($unicaenDir . '*'), 'is_dir'); + $nd = array_filter(glob($oseDir . 'vendor/unicaen/*'), 'is_dir'); foreach ($nd as $dir) { if (is_dir($dir . '/public')) { $newLibs[] = basename($dir); @@ -208,22 +205,23 @@ class OseDeploy $createLibs = array_diff($newLibs, $oldLibs); foreach ($deleteLibs as $lib) { - $command = "rm $publicDir$lib"; + $command = "rm $oseDir"."public/vendor/unicaen/$lib"; $this->console->print($command); $this->console->exec($command); } foreach ($createLibs as $lib) { - $command = "ln -sf $unicaenDir$lib/public $publicDir$lib"; + $command = "cd $oseDir/public/vendor/unicaen;ln -sf ../../../vendor/unicaen/$lib/public $lib"; $this->console->print($command); $this->console->exec($command); } - return ! (empty($deleteLibs) && empty($createLibs)); + return !(empty($deleteLibs) && empty($createLibs)); } + public function checkPhpModules(array $modules) { $len = 60; diff --git "a/data/D\303\251ploiement/Changements.pdf" "b/data/D\303\251ploiement/Changements.pdf" index 5f7bd5e24fa8e34a9926683fa038559e8f9aee8a..d83f19de6c9228d8d2c6104bae4b206a95047a18 100644 Binary files "a/data/D\303\251ploiement/Changements.pdf" and "b/data/D\303\251ploiement/Changements.pdf" differ diff --git "a/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" "b/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" index 8c292e380df1463e3d048d0a043c539902ec60a1..175d72b7c181cf80f2aadcedb8a7e7418dff450b 100644 Binary files "a/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" and "b/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" differ diff --git "a/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" "b/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" index ecda514716944c212047493687fbae4e3d9c596d..b3a7f8be75d20b5ce3067029851a3c5d5427b984 100644 Binary files "a/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" and "b/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" differ