mirror of
https://github.com/freescout-helpdesk/freescout.git
synced 2024-11-24 11:22:42 +01:00
Optimize self-updating
This commit is contained in:
FreeScout
parent
90bd50c38e
commit
8a6c81c607
@ -67,6 +67,29 @@ return [
|
||||
'storage/logs',
|
||||
'storage/self-update',
|
||||
'vendor',
|
||||
// These folders are opied using File::move().
|
||||
'app',
|
||||
'config',
|
||||
'database',
|
||||
'overrides',
|
||||
'public',
|
||||
'resources',
|
||||
'routes',
|
||||
'tests',
|
||||
],
|
||||
|
||||
/*
|
||||
| These folder are copied using File::move().
|
||||
*/
|
||||
'folders_to_move' => [
|
||||
'app',
|
||||
'config',
|
||||
'database',
|
||||
'overrides',
|
||||
'public',
|
||||
'resources',
|
||||
'routes',
|
||||
'tests',
|
||||
],
|
||||
|
||||
/*
|
||||
|
||||
@ -133,7 +133,9 @@ class GithubRepositoryType extends AbstractRepositoryType implements SourceRepos
|
||||
}
|
||||
|
||||
// Copy Vendor first.
|
||||
File::deleteDirectory(base_path('vendor_backup'));
|
||||
if (File::exists(base_path('vendor_backup'))) {
|
||||
File::deleteDirectory(base_path('vendor_backup'));
|
||||
}
|
||||
|
||||
// We copy new vendor and rename to avoid error:
|
||||
// /vendor/composer/../laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php): failed to open stream: No such file or directory in /vendor/composer/ClassLoader.php:444
|
||||
@ -150,10 +152,19 @@ class GithubRepositoryType extends AbstractRepositoryType implements SourceRepos
|
||||
base_path('vendor')
|
||||
);
|
||||
|
||||
// Move all directories first
|
||||
// Move folders
|
||||
foreach ($this->config['folders_to_move'] as $folder) {
|
||||
File::move(
|
||||
$sourcePath.DIRECTORY_SEPARATOR.$folder,
|
||||
base_path($folder)
|
||||
);
|
||||
}
|
||||
|
||||
// Move directories
|
||||
collect((new Finder())->in($sourcePath)->exclude($this->config['exclude_folders'])->directories()->sort(function ($a, $b) {
|
||||
return strlen($b->getRealpath()) - strlen($a->getRealpath());
|
||||
}))->each(function ($directory) { /** @var \SplFileInfo $directory */
|
||||
|
||||
if (count(array_intersect(File::directories(
|
||||
$directory->getRealPath()), $this->config['exclude_folders'])) == 0
|
||||
) {
|
||||
|
||||
161
tools/upgrade.sh
161
tools/upgrade.sh
@ -1,161 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# FreeScout upgrade script.
|
||||
#
|
||||
# If you need you can create /tools/pre_upgrade.sh script which will be launched in the beginning.
|
||||
|
||||
DATE_TIME=`date +%Y-%m-%d_%H:%M:%S`
|
||||
echo -e "Starting upgrading: \e[32m${DATE_TIME}\e[0m";
|
||||
|
||||
# Check PHP version
|
||||
php_v=`php -v | grep 'PHP 7' | wc -l`
|
||||
if [ $php_v != 1 ]; then
|
||||
echo -e "\e[32mChecking PHP version...\e[0m";
|
||||
php -v
|
||||
echo -e "\e[31mInvalid PHP version (PHP 7.x is required)\e[0m";
|
||||
exit;
|
||||
fi
|
||||
|
||||
echo -e "\e[33mMake sure to create a backup of the application before you continue.\e[0m";
|
||||
|
||||
# Determine project root
|
||||
TOOLS_DIR=`which $0 | xargs dirname`;
|
||||
if [ $TOOLS_DIR = '' ]; then
|
||||
echo -e "\e[31mCould not determine project root folder.\e[0m";
|
||||
exit;
|
||||
fi
|
||||
PROJECT_ROOT="${TOOLS_DIR}/..";
|
||||
|
||||
cd $PROJECT_ROOT;
|
||||
PROJECT_ROOT=`pwd`;
|
||||
echo -e "Application root: \e[32m${PROJECT_ROOT}\e[0m"
|
||||
|
||||
if [ -f "${TOOLS_DIR}/pre_upgrade.sh" ]; then
|
||||
echo "Including pre_upgrade.sh"
|
||||
source "${TOOLS_DIR}/pre_upgrade.sh";
|
||||
fi
|
||||
|
||||
#if [ -f "${PROJECT_ROOT}/.gitcommit" ]; then
|
||||
# gitcommit=`more "${PROJECT_ROOT}/.gitcommit"`
|
||||
# echo -e "Last commit: \e[32m${gitcommit}\e[0m";
|
||||
#fi
|
||||
|
||||
# Check if git is installed
|
||||
git_installed=`command -v git`;
|
||||
if [ -z "$git_installed" ]; then
|
||||
echo -e "\e[31mGit is not installed. Please intall Git and restart upgrade.\e[0m";
|
||||
exit;
|
||||
fi
|
||||
|
||||
# Check if there is a Git repo in the project folder
|
||||
git_inited=`git status | grep 'On branch' | wc -l`
|
||||
|
||||
if [ $git_inited != 1 ]; then
|
||||
|
||||
# Initizalize Git and install latest version of the app
|
||||
|
||||
printf "\nGit repository is not initizalized yet. Would you like to install the latest verion of the application via Git (this will replace existing files)? (Y/n) [n]:"
|
||||
read confirm_gitinit;
|
||||
if [ $confirm_gitinit != "Y" ]; then
|
||||
exit;
|
||||
fi
|
||||
|
||||
git init
|
||||
git remote add origin https://github.com/freescout-helpdesk/freescout.git
|
||||
git fetch
|
||||
|
||||
# If user stop here next time he will get: "Your Git repository is on a wrong branch"
|
||||
#printf "\nReady to install application from remote repository. Continue? (Y/n) [n]:"
|
||||
#read confirm_checkout;
|
||||
#if [ $confirm_checkout != "Y" ]; then
|
||||
# exit;
|
||||
#fi
|
||||
git checkout -t -f origin/dist
|
||||
else
|
||||
# Update app via Git
|
||||
|
||||
# Check branch
|
||||
branch=`git branch | grep '* ' | sed 's#* ##g'`;
|
||||
if [[ $branch != 'dist' && $branch != 'master' ]]; then
|
||||
echo -e "\e[31mYour Git repository is on a wrong branch: ${branch}. Upgrading is possible only for dist or master branches. Please switch to the correct branch and restart upgdate.\e[0m";
|
||||
exit;
|
||||
fi
|
||||
|
||||
echo -e "Current branch: \e[32m${branch}\e[0m";
|
||||
|
||||
git fetch
|
||||
|
||||
new_commits=`git log "$branch..origin/$branch" --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short | wc -l`;
|
||||
if [ $new_commits = 0 ]; then
|
||||
echo -e "\e[32mYou already have the latest version of the application, no upgrade needed.\e[0m";
|
||||
exit;
|
||||
fi
|
||||
|
||||
# Check if there are uncommited files
|
||||
has_unstaged=`git status | grep -E '(Changes not staged for commit|Untracked files)' | wc -l`
|
||||
if [ $has_unstaged = 1 ]; then
|
||||
git status;
|
||||
printf "\nThere are uncommitted files, they may be overwritten during upgrade. Continue? (Y/n) [n]:"
|
||||
read confirm_overwrite
|
||||
if [ $confirm_overwrite != "Y" ]; then
|
||||
exit;
|
||||
fi
|
||||
fi
|
||||
|
||||
printf "\nNew commits:\n";
|
||||
git log "$branch..origin/$branch" --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short
|
||||
|
||||
printf "\nPull updates and continue? (Y/n) [n]:"
|
||||
read confirm_pull
|
||||
if [ $confirm_pull != "Y" ]; then
|
||||
exit;
|
||||
fi
|
||||
|
||||
git pull -f
|
||||
|
||||
printf "\nPulling updates finished. Continue? (Y/n) [n]:"
|
||||
read confirm_continue
|
||||
if [ $confirm_continue != "Y" ]; then
|
||||
exit;
|
||||
fi
|
||||
|
||||
printf "\nStatus:\n"
|
||||
git status
|
||||
|
||||
# If branch is master, run composer install
|
||||
if [ $branch = 'master' ]; then
|
||||
printf "\nComposer dependencies will be installed. Continue? (Y/n) [n]:"
|
||||
read confirm_install
|
||||
if [ $confirm_install != "Y" ]; then
|
||||
exit;
|
||||
fi
|
||||
|
||||
# Check if composer intalled
|
||||
composer_installed=`composer -V | grep version | wc -l`
|
||||
if [ $composer_installed != 1 ]; then
|
||||
echo -e "\e[31mComposer command not found. Please intall composer (https://getcomposer.org/download/) and restart upgrade.\e[0m";
|
||||
exit;
|
||||
fi
|
||||
|
||||
composer install;
|
||||
|
||||
printf "\nStatus:\n"
|
||||
git status
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
printf "\nClearing cache:\n"
|
||||
php artisan freescout:clear-cache
|
||||
#php artisan package:discover
|
||||
|
||||
printf "Run DB migration and continue? (Y/n) [n]:"
|
||||
read confirm_migrate
|
||||
if [ $confirm_migrate != "Y" ]; then
|
||||
exit;
|
||||
fi
|
||||
php artisan migrate
|
||||
|
||||
|
||||
php artisan queue:restart
|
||||
Loading…
Reference in New Issue
Block a user