From c56e6999851aca5661c60fc08771e0560d0b9a69 Mon Sep 17 00:00:00 2001
From: Boy132 <Boy132@users.noreply.github.com>
Date: Tue, 20 Apr 2021 17:39:34 +0200
Subject: [PATCH] Separated user from group

---
 app/Console/Commands/UpgradeCommand.php | 36 +++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/UpgradeCommand.php b/app/Console/Commands/UpgradeCommand.php
index d13557b43..db0e23fd4 100644
--- a/app/Console/Commands/UpgradeCommand.php
+++ b/app/Console/Commands/UpgradeCommand.php
@@ -14,7 +14,8 @@ class UpgradeCommand extends Command
 
     /** @var string */
     protected $signature = 'p:upgrade
-        {--user= : The user (and group) that PHP runs under. All files will be owned by this user (and group).}
+        {--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.}';
@@ -53,19 +54,32 @@ class UpgradeCommand extends Command
             }
 
             if (is_null($this->option('user'))) {
-                $user_details = posix_getpwuid(fileowner('public'));
-                $user = $user_details['name'] ?? 'www-data';
-                
-                $group_details = posix_getgrgid(filegroup('public'));
-                $group = $group_details['name'] ?? 'www-data';
+                $userDetails = posix_getpwuid(fileowner('public'));
+                $user = $userDetails['name'] ?? 'www-data';
 
-                if (!$this->confirm("Your webserver user (and group) has been detected as [{$user}:{$group}]: is this correct?", true)) {
+                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:www-data", "nginx:nginx", or "apache:apache".',
+                        '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:www-data',
-                            'nginx:nginx',
-                            'apache: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',
                         ]
                     );
                 }