#2 avoid installing a user group if it already exists; code cleanup

1stthomas · May 24, 2021 · 1c7a5d3 · 1c7a5d3
1 parent e64b649
commit 1c7a5d3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "ht7/ht7_c5_base",
     "type": "concrete5-package",
+    "keywords": ["concrete5", "package"],
     "repositories": [
         {
             "type": "git",

diff --git a/controller.php b/controller.php
@@ -3,8 +3,6 @@
 namespace Concrete\Package\Ht7C5Base;
 
 use \Concrete\Core\Application\Application;
-use \Concrete\Core\Asset\AssetList;
-use \Concrete\Core\File\Filesystem;
 use \Concrete\Core\Foundation\Service\ProviderList;
 use \Concrete\Core\Package\Package;
 use \Concrete\Core\Package\PackageService;
@@ -53,7 +51,8 @@ public function install()
         $this->pkg = parent::install();
         // Create all pages through the content XML.
         $this->installContentFile('install.xml');
-        // Make sure the package helper can be accessed.
+        // Make sure the package helper can be accessed by later installation
+        // process' of this package.
         $this->registerServices();
         // If the path uses "-" to separate words and the filename
         // uses "_", the cFilename on the Pages table is empty.
@@ -65,9 +64,7 @@ public function install()
 
     public function on_start()
     {
-        $this->registerAssets();
         $this->registerServices();
-        $this->registerRoutes();
     }
 
     /**
@@ -80,23 +77,6 @@ private function fixFilenames()
                 ->fixFilenames('/dashboard/ht7', $this->pkg);
     }
 
-    private function registerAssets()
-    {
-
-    }
-
-    /**
-     * Register all routes defined in config/paths.php.
-     *
-     * This method let the route helper compose an array which can be used by
-     * calling <code>Route::registerMultiple($routesArray)</code>.
-     *
-     */
-    public function registerRoutes()
-    {
-
-    }
-
     public function upgrade()
     {
         parent::upgrade();
@@ -107,12 +87,16 @@ public function upgrade()
 
     private function installUserGroups()
     {
-        Group::add(
-                tc('ht7_c5_base-group_name', 'ht7'),
-                tc('ht7_c5_base-group_name', 'Base Group for ht7 applications.'),
-                false,
-                $this->pkg
-        );
+        $gName = tc('ht7_c5_base-group_name', 'ht7');
+
+        if (!is_object(Group::getByName($gName))) {
+            Group::add(
+                    $gName,
+                    tc('ht7_c5_base-group_name', 'Base Group for ht7 applications.'),
+                    false,
+                    $this->pkg
+            );
+        }
     }
 
     /**