Unify to a single console command location.

bin/azuracast

@@ -1,3 +0,0 @@
-#!/usr/bin/env php
-<?php
-include __DIR__.'/azuracast.php';

bin/azuracast.php

@@ -1,17 +0,0 @@
-<?php
-error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
-ini_set('display_errors', 1);
-
-$autoloader = require dirname(__DIR__) . '/vendor/autoload.php';
-
-$app = App\AppFactory::create($autoloader, [
-    Azura\Settings::BASE_DIR => dirname(__DIR__),
-]);
-
-$di = $app->getContainer();
-
-App\Customization::initCli();
-
-/** @var Azura\Console\Application $cli */
-$cli = $di->get(Azura\Console\Application::class);
-$cli->run();

bin/console

@@ -1,3 +1,18 @@
 #!/usr/bin/env php
 <?php
-include __DIR__.'/azuracast.php';
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+ini_set('display_errors', 1);
+
+$autoloader = require dirname(__DIR__) . '/vendor/autoload.php';
+
+$app = App\AppFactory::create($autoloader, [
+        Azura\Settings::BASE_DIR => dirname(__DIR__),
+]);
+
+$di = $app->getContainer();
+
+App\Customization::initCli();
+
+/** @var Azura\Console\Application $cli */
+$cli = $di->get(Azura\Console\Application::class);
+$cli->run();

composer.json

@@ -109,7 +109,7 @@
     }
   },
   "bin": [
-    "bin/azuracast"
+    "bin/console"
   ],
   "config": {
     "preferred-install": "dist"

docker-migrate.sh

@@ -16,8 +16,8 @@ fi
 BASE_DIR=`pwd`
 
 # Create backup from existing installation.
-chmod a+x bin/azuracast
+chmod a+x bin/console
-./bin/azuracast azuracast:backup --exclude-media migration.zip
+./bin/console azuracast:backup --exclude-media migration.zip
 
 read -n 1 -s -r -p "Database backed up. Press any key to continue (Install Docker)..."
 

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;

templates/admin/backups/index.phtml

@@ -6,7 +6,7 @@
 
 $this->layout('main', [
     'title' => __('Backups'),
-    'manual' => true
+    'manual' => true,
 ]);
 
 $assets
@@ -69,7 +69,7 @@ $assets
             <?php if (\App\Settings::getInstance()->isDocker()): ?>
                 <pre><code>./docker.sh restore path_to_backup.zip</code></pre>
             <?php else: ?>
-            <pre><code>/var/azuracast/www/bin/azuracast azuracast:restore path_to_backup.zip</code></pre>
+                <pre><code>/var/azuracast/www/bin/console azuracast:restore path_to_backup.zip</code></pre>
             <?php endif; ?>
 
             <p class="card-text text-warning"><?=__('Note that restoring a backup will clear your existing database. Never restore backup files from untrusted users.')?></p>
@@ -107,14 +107,21 @@ $assets
             <tr class="align-middle">
                 <td>
                     <div class="btn-group btn-group-sm">
-                        <a class="btn btn-sm btn-primary" href="<?=$router->fromHere('admin:backups:download', ['path' => base64_encode($row['path'])]) ?>"><?=__('Download') ?></a>
+                        <a class="btn btn-sm btn-primary" href="<?=$router->fromHere('admin:backups:download',
-                        <a class="btn btn-sm btn-danger" href="<?=$router->fromHere('admin:backups:delete', ['path' => base64_encode($row['path']), 'csrf' => $csrf]) ?>"  data-confirm-title="<?=$this->e(__('Delete backup "%s"?', $row['filename'])) ?>"><?=__('Delete') ?></a>
+                            ['path' => base64_encode($row['path'])])?>"><?=__('Download')?></a>
+                        <a class="btn btn-sm btn-danger" href="<?=$router->fromHere('admin:backups:delete', [
+                            'path' => base64_encode($row['path']),
+                            'csrf' => $csrf,
+                        ])?>" data-confirm-title="<?=$this->e(__('Delete backup "%s"?',
+                            $row['filename']))?>"><?=__('Delete')?></a>
                     </div>
                 </td>
                 <td>
                     <big><?=$this->e($row['basename'])?></big>
                 </td>
-                <td><time data-content="<?=$row['timestamp'] ?>"><?=gmdate('Y-m-d', $row['timestamp']) ?></time></td>
+                <td>
+                    <time data-content="<?=$row['timestamp']?>"><?=gmdate('Y-m-d', $row['timestamp'])?></time>
+                </td>
                 <td><span data-file-size="<?=$row['size']?>"><?=$row['size']?></span></td>
             </tr>
         <?php endforeach; ?>
@@ -128,7 +135,8 @@ $assets
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title" id="modal-log-view-label"><?=__('Most Recent Backup Log')?></h4>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span></button>
                 </div>
                 <div class="modal-body">
                     <pre id="modal-log-view-contents"><?=$last_output?></pre>

util/ansible/roles/azuracast-setup/tasks/main.yml

@@ -3,16 +3,16 @@
     file: path="{{ item }}" state=touch mode="a+x"
     with_items:
      - "{{ www_base }}/update.sh"
-     - "{{ www_base }}/bin/azuracast"
+     - "{{ www_base }}/bin/console"
 
   - name: Run AzuraCast Setup (Install Mode)
     become: true
     become_user: azuracast
-    shell: php {{ www_base }}/bin/azuracast.php azuracast:setup
+    shell: php {{ www_base }}/bin/console azuracast:setup
     when: update_mode|bool == false
 
   - name: Run AzuraCast Setup (Update Mode)
     become: true
     become_user: azuracast
-    shell: php {{ www_base }}/bin/azuracast.php azuracast:setup --update
+    shell: php {{ www_base }}/bin/console azuracast:setup --update
     when: update_mode|bool == true

util/cli.php

@@ -1,2 +0,0 @@
-<?php
-include dirname(__DIR__) . '/bin/azuracast.php';