Fixed dependencies, user add, function call.

1 files changed, 6 insertions, 10 deletions

diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index bb5a8bd..6a3bf83 100644
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -13,6 +13,7 @@ REQUIRED_PACKAGES = ["python-pip", "python-webob", "python-bcrypt",
                      "python-mock", "python-babel", "python-dateutil",
                      "python-markdown", "python-webhelpers", "python-docutils",
                      "python-formencode", "python-pylons", "python-dev",
+                     "python-pastescript", "python-psycopg2",
                      "build-essential", "apache2"]
 # Packages required for celery integration.
 CELERY_REQUIRED_PACKAGES = ["python-celery", "rabbitmq-server"]
@@ -25,8 +26,7 @@ DB_NAME = "rhodecode"
 
 # Packages to be installed via PIP.
 PIP_PACKAGES = {
-    "psycopg2": None,
-    "dulwich": "0.8.7",
+    "mercurial": "2.4.1",
     "beaker": "1.6.4",
     "sqlalchemy": "0.7.9",
     "mako": "0.7.3",
@@ -176,16 +176,13 @@ def setup_user(user, home_dir, group):
 
     :param user: The name of the user and group to create.
     """
-    # Add the user.
-    cmd_args = ["adduser", "--system", "--home", home_dir, user]
-    execute_command(cmd_args)
-
     # Add the user group.
     cmd_args = ["addgroup", "--system", group]
     execute_command(cmd_args)
 
-    # Add the user to its group.
-    cmd_args = ["adduser", user, group]
+    # Add the user.
+    cmd_args = ["adduser", "--system", "--home", home_dir, "--ingroup",
+                group, user]
     execute_command(cmd_args)
 
 
@@ -571,8 +568,7 @@ if __name__ == '__main__':
                     args.rhodecode_admin_usr,
                     args.rhodecode_admin_pwd,
                     args.rhodecode_admin_email,
-                    args.rhodecode_usr,
-                    args.assume_yes)
+                    args.rhodecode_usr)
 
     install_upstart_conf(args.no_celery)