diff --git a/bin/azuracast b/bin/azuracast deleted file mode 100755 index 9e6ae44fb..000000000 --- a/bin/azuracast +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env php - dirname(__DIR__), -]); - -$di = $app->getContainer(); - -App\Customization::initCli(); - -/** @var Azura\Console\Application $cli */ -$cli = $di->get(Azura\Console\Application::class); -$cli->run(); \ No newline at end of file diff --git a/bin/console b/bin/console index 9e6ae44fb..112c147f9 100644 --- a/bin/console +++ b/bin/console @@ -1,3 +1,18 @@ #!/usr/bin/env php dirname(__DIR__), +]); + +$di = $app->getContainer(); + +App\Customization::initCli(); + +/** @var Azura\Console\Application $cli */ +$cli = $di->get(Azura\Console\Application::class); +$cli->run(); \ No newline at end of file diff --git a/composer.json b/composer.json index 0516d9951..aa280ae6e 100644 --- a/composer.json +++ b/composer.json @@ -109,7 +109,7 @@ } }, "bin": [ - "bin/azuracast" + "bin/console" ], "config": { "preferred-install": "dist" diff --git a/docker-migrate.sh b/docker-migrate.sh index c48c83903..37bfbb2bd 100644 --- a/docker-migrate.sh +++ b/docker-migrate.sh @@ -16,8 +16,8 @@ fi BASE_DIR=`pwd` # Create backup from existing installation. -chmod a+x bin/azuracast -./bin/azuracast azuracast:backup --exclude-media migration.zip +chmod a+x bin/console +./bin/console azuracast:backup --exclude-media migration.zip read -n 1 -s -r -p "Database backed up. Press any key to continue (Install Docker)..." diff --git a/src/Radio/Backend/Liquidsoap.php b/src/Radio/Backend/Liquidsoap.php index 9369dc811..854af60b2 100644 --- a/src/Radio/Backend/Liquidsoap.php +++ b/src/Radio/Backend/Liquidsoap.php @@ -719,7 +719,7 @@ class Liquidsoap extends AbstractBackend implements EventSubscriberInterface } } else { // Ansible shell-script call. - $shell_path = '/usr/bin/php ' . $settings->getBaseDirectory() . '/bin/azuracast'; + $shell_path = '/usr/bin/php ' . $settings->getBaseDirectory() . '/bin/console'; $shell_args = []; $shell_args[] = 'azuracast:internal:' . $endpoint; diff --git a/templates/admin/backups/index.phtml b/templates/admin/backups/index.phtml index 56d68265a..516f052b3 100644 --- a/templates/admin/backups/index.phtml +++ b/templates/admin/backups/index.phtml @@ -6,7 +6,7 @@ $this->layout('main', [ 'title' => __('Backups'), - 'manual' => true + 'manual' => true, ]); $assets @@ -16,75 +16,75 @@ $assets
- 0): ?> - =__('Last run: %s', '') ?> - - =__('Never run') ?> + +
+ 0): ?> + =__('Last run: %s', '')?> + + =__('Never run')?> + +
+=__('To restore a backup from your host computer, run:') ?>
+=__('To restore a backup from your host computer, run:')?>
- isDocker()): ?> -./docker.sh restore path_to_backup.zip
-
- /var/azuracast/www/bin/azuracast azuracast:restore path_to_backup.zip
-
+ isDocker()): ?>
+ ./docker.sh restore path_to_backup.zip
+
+ /var/azuracast/www/bin/console azuracast:restore path_to_backup.zip
+
- =__('Note that restoring a backup will clear your existing database. Never restore backup files from untrusted users.') ?>
+=__('Note that restoring a backup will clear your existing database. Never restore backup files from untrusted users.')?>
=__('Actions') ?> | -=__('Backup') ?> | -=__('Last Modified') ?> | -=__('Size') ?> | +=__('Actions')?> | +=__('Backup')?> | +=__('Last Modified')?> | +=__('Size')?> |
---|---|---|---|---|---|---|---|
- =$this->e($row['basename']) ?> + =$this->e($row['basename'])?> | -- | =$row['size'] ?> | ++ + | +=$row['size']?> |