diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/installto.sh | 6 | ||||
-rwxr-xr-x | bin/update.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bin/installto.sh b/bin/installto.sh index e69560caa..12d317e12 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -44,7 +44,11 @@ $input = trim(fgets(STDIN)); if (strtolower($input) == 'y') { $err = false; echo "Copying files to target location..."; - foreach (array('program','installer','bin','SQL','plugins','skins') as $dir) { + $dirs = array('program','installer','bin','SQL','plugins','skins'); + if (is_dir(INSTALL_PATH . 'vendor') && !is_file(INSTALL_PATH . 'composer.json')) { + $dirs[] = 'vendor'; + } + foreach ($dirs as $dir) { if (!system("rsync -avC " . INSTALL_PATH . "$dir/* $target_dir/$dir/")) { $err = true; break; diff --git a/bin/update.sh b/bin/update.sh index 9d3508ede..26314408c 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -196,7 +196,7 @@ if ($RCI->configured) { } // write updated composer.json back to disk - if (0&&$comsposer_json && is_writeable(INSTALL_PATH . 'composer.json')) { + if ($comsposer_json && is_writeable(INSTALL_PATH . 'composer.json')) { $success &= (bool)file_put_contents(INSTALL_PATH . 'composer.json', $comsposer_json); } else { |