Fix error with backup db filename and with rhodecode config path.

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index 179e8a8..cc62cbb 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -557,7 +557,7 @@ def backup_postgres_db(home_dir, db_name, postgres_usr="postgres"):
     cmd_args = ["-u", postgres_usr, "pg_dump", db_name, "-f", tempfile_name]
     execute_command(cmd_args, work_dir=home_dir)
 
-    cmd_args = ["cp", tempfile_name, DB_BACKUP_FILENAME]
+    cmd_args = ["cp", tempfile_name, db_filename]
     execute_command(cmd_args, work_dir=home_dir)
 
 
@@ -741,6 +741,8 @@ if __name__ == '__main__':
 
     home_dir = os.path.join("/home", args.rhodecode_usr)
     work_dir = os.path.join(home_dir, args.rhodecode_checkout_dir)
+    rhodecode_conf = os.path.join(home_dir,
+                                  os.path.basename(args.rhodecode_config))
 
     if args.update:
         # Stop rhodecode
@@ -756,7 +758,7 @@ if __name__ == '__main__':
         reinstall_rhodecode(work_dir)
 
         # Update database schema.
-        update_database_schema(work_dir, args.rhodecode_config)
+        update_database_schema(work_dir, rhodecode_conf)
 
         # Start rhodecode and celery.
         start_service("rhodecode")
@@ -818,8 +820,6 @@ if __name__ == '__main__':
         set_owners(work_dir, args.rhodecode_usr)
         install_rhodecode(work_dir, args.rhodecode_usr)
 
-        rhodecode_conf = os.path.join(home_dir,
-                                      os.path.basename(args.rhodecode_config))
         copy_file(args.rhodecode_config, home_dir)
         set_owners(rhodecode_conf, args.rhodecode_usr)