Merge pull request pterodactyl#3279 from Boy132/patch-1

Add group input to upgrade command

Author: DaneEveritt

app/Console/Commands/UpgradeCommand.php

@@ -15,6 +15,7 @@ class UpgradeCommand extends Command
     /** @var string */
     protected $signature = 'p:upgrade
         {--user= : The user that PHP runs under. All files will be owned by this user.}
+        {--group= : The group that PHP runs under. All files will be owned by this group.}
         {--url= : The specific archive to download.}
         {--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.}
         {--skip-download : If set no archive will be downloaded.}';
@@ -46,22 +47,39 @@ public function handle()
         }
 
         $user = 'www-data';
+        $group = 'www-data';
         if ($this->input->isInteractive()) {
             if (!$skipDownload) {
                 $skipDownload = !$this->confirm('Would you like to download and unpack the archive files for the latest version?', true);
             }
 
             if (is_null($this->option('user'))) {
-                $details = posix_getpwuid(fileowner('public'));
-                $user = $details['name'] ?? 'www-data';
+                $userDetails = posix_getpwuid(fileowner('public'));
+                $user = $userDetails['name'] ?? 'www-data';
 
                 if (!$this->confirm("Your webserver user has been detected as [{$user}]: is this correct?", true)) {
                     $user = $this->anticipate(
                         'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
                         [
                             'www-data',
+                            'nginx',
                             'apache',
+                        ]
+                    );
+                }
+            }
+            
+            if (is_null($this->option('group'))) {
+                $groupDetails = posix_getgrgid(filegroup('public'));
+                $group = $groupDetails['name'] ?? 'www-data';
+
+                if (!$this->confirm("Your webserver group has been detected as [{$group}]: is this correct?", true)) {
+                    $group = $this->anticipate(
+                        'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
+                        [
+                            'www-data',
                             'nginx',
+                            'apache',
                         ]
                     );
                 }
@@ -136,9 +154,9 @@ public function handle()
             $this->call('migrate', ['--seed' => '', '--force' => '']);
         });
 
-        $this->withProgress($bar, function () use ($user) {
-            $this->line("\$upgrader> chown -R {$user}:{$user} *");
-            $process = Process::fromShellCommandline("chown -R {$user}:{$user} *", $this->getLaravel()->basePath());
+        $this->withProgress($bar, function () use ($user, $group) {
+            $this->line("\$upgrader> chown -R {$user}:{$group} *");
+            $process = Process::fromShellCommandline("chown -R {$user}:{$group} *", $this->getLaravel()->basePath());
             $process->setTimeout(10 * 60);
             $process->run(function ($type, $buffer) {
                 $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);