mirror of
https://github.com/snipe/snipe-it.git
synced 2026-02-04 23:05:41 +00:00
Merge branch 'develop' into integrations/2020-04-15-v5-merge
# Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js
This commit is contained in:
snipe
95
upgrade.php
95
upgrade.php
@ -1,6 +1,8 @@
|
||||
<?php
|
||||
(PHP_SAPI !== 'cli' || isset($_SERVER['HTTP_USER_AGENT'])) && die('Access denied.');
|
||||
|
||||
$required_version = '7.1.3';
|
||||
|
||||
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
|
||||
echo "Skipping user check as it is not supported on Windows\n";
|
||||
} else {
|
||||
@ -30,20 +32,38 @@ echo "!! https://snipe-it.readme.io/docs/upgrading-to-v4\n";
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "STEP 1: Backing up database: \n";
|
||||
echo "STEP 1: Checking PHP requirements: \n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
echo "Current PHP version: " . PHP_VERSION . "\n\n";
|
||||
|
||||
if (version_compare(PHP_VERSION, $required_version, '<')) {
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
|
||||
echo "This version of PHP is not compatible with Snipe-IT.\n";
|
||||
echo "Snipe-IT requires PHP version ".$required_version." or greater. Please upgrade \n";
|
||||
echo "your server's version of PHP (mod and cli) and try running this script again.\n\n\n";
|
||||
exit;
|
||||
|
||||
} else {
|
||||
echo "PHP version: " . PHP_VERSION . " is at least ".$required_version." - continuing... \n\n";
|
||||
}
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "STEP 2: Backing up database: \n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
$backup = shell_exec('php artisan snipeit:backup');
|
||||
echo '-- '.$backup."\n\n";
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "STEP 2: Putting application into maintenance mode: \n";
|
||||
echo "STEP 3: Putting application into maintenance mode: \n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
$down = shell_exec('php artisan down');
|
||||
echo '-- '.$down."\n\n";
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "STEP 3: Pulling latest from Git (".$branch." branch): \n";
|
||||
echo "STEP 4: Pulling latest from Git (".$branch." branch): \n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
$git_version = shell_exec('git --version');
|
||||
|
||||
@ -65,12 +85,12 @@ if ((strpos('git version', $git_version)) === false) {
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 4: Cleaning up old cached files:\n";
|
||||
echo "Step 5: Cleaning up old cached files:\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
|
||||
if (file_exists('bootstrap/cache/compiled.php')) {
|
||||
echo "-- Deleting bootstrap/cache/compiled.php. It it no longer used.\n";
|
||||
echo "-- Deleting bootstrap/cache/compiled.php. It is no longer used.\n";
|
||||
@unlink('bootstrap/cache/compiled.php');
|
||||
} else {
|
||||
echo "-- No bootstrap/cache/compiled.php, so nothing to delete.\n";
|
||||
@ -101,7 +121,7 @@ echo '-- '.$view_clear;
|
||||
echo "\n";
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 5: Updating composer dependencies:\n";
|
||||
echo "Step 6: Updating composer dependencies:\n";
|
||||
echo "(This may take an moment.)\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
@ -127,7 +147,7 @@ echo $composer."\n\n";
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 6: Migrating database:\n";
|
||||
echo "Step 7: Migrating database:\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
$migrations = shell_exec('php artisan migrate --force');
|
||||
@ -135,7 +155,7 @@ echo '-- '.$migrations."\n\n";
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 7: Checking for OAuth keys:\n";
|
||||
echo "Step 8: Checking for OAuth keys:\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
|
||||
@ -149,7 +169,7 @@ if ((!file_exists('storage/oauth-public.key')) || (!file_exists('storage/oauth-p
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 8: Caching routes and config:\n";
|
||||
echo "Step 9: Caching routes and config:\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
$config_cache = shell_exec('php artisan config:cache');
|
||||
$route_cache = shell_exec('php artisan route:cache');
|
||||
@ -160,16 +180,71 @@ echo "\n";
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 9: Taking application out of maintenance mode:\n";
|
||||
echo "Step 10: Taking application out of maintenance mode:\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
$up = shell_exec('php artisan up');
|
||||
echo '-- '.$up."\n\n";
|
||||
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "Step 11: Checking for v5 public storage directories: \n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
|
||||
if ((!file_exists('storage/app/public')) && (!is_dir('storage/app/public'))) {
|
||||
echo "- No public directory found in storage/app - creating one.\n\n";
|
||||
if (!mkdir('storage/app/public', 0777, true)) {
|
||||
echo "ERROR: Failed to create directory at storage/app/public. You should do this manually.\n\n";
|
||||
}
|
||||
$storage_simlink = shell_exec('php artisan storage:link');
|
||||
echo $storage_simlink;
|
||||
|
||||
} else {
|
||||
echo "- Public storage directory already exists. Skipping...\n\n";
|
||||
}
|
||||
|
||||
echo "- Copying files into storage/app/public.\n\n";
|
||||
if (rmove('public/uploads','storage/app/public')) {
|
||||
echo "- Copy successful.\n\n";
|
||||
} else {
|
||||
echo "- Copy failed - you should do this manually by copying the files from public/uploads into the storage/app/public directory.\n\n";
|
||||
}
|
||||
|
||||
echo "--------------------------------------------------------\n";
|
||||
echo "FINISHED! Clear your browser cookies and re-login to use :\n";
|
||||
echo "your upgraded Snipe-IT.\n";
|
||||
echo "--------------------------------------------------------\n\n";
|
||||
|
||||
|
||||
/**
|
||||
* Recursively move files from one directory to another
|
||||
*
|
||||
* @param String $src - Source of files being moved
|
||||
* @param String $dest - Destination of files being moved
|
||||
*/
|
||||
function rmove($src, $dest){
|
||||
|
||||
// If source is not a directory stop processing
|
||||
if(!is_dir($src)) return false;
|
||||
|
||||
// If the destination directory does not exist create it
|
||||
if(!is_dir($dest)) {
|
||||
if(!mkdir($dest)) {
|
||||
// If the destination directory could not be created stop processing
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Open the source directory to read in files
|
||||
$i = new DirectoryIterator($src);
|
||||
foreach($i as $f) {
|
||||
if($f->isFile()) {
|
||||
rename($f->getRealPath(), "$dest/" . $f->getFilename());
|
||||
} else if(!$f->isDot() && $f->isDir()) {
|
||||
rmove($f->getRealPath(), "$dest/$f");
|
||||
unlink($f->getRealPath());
|
||||
}
|
||||
}
|
||||
unlink($src);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user