From 84351e7f01e6ca36c742504b6bcd9b9e7ecac161 Mon Sep 17 00:00:00 2001
From: Jiajie Chen <c@jia.je>
Date: Tue, 7 May 2024 19:37:26 +0800
Subject: [PATCH] main: add args to override paths to allow non-root usage

---
 acbs-build   |  9 +++++++++
 acbs/main.py | 33 +++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/acbs-build b/acbs-build
index dda6709..b26ccbf 100755
--- a/acbs-build
+++ b/acbs-build
@@ -44,6 +44,15 @@ def main() -> None:
                         help='Only download source packages without building', action="store_true")
     parser.add_argument('-r', '--resume', nargs=1, dest='state_file',
                         help='Resume a previous build attempt')
+    parser.add_argument('-l', '--cache-dir', nargs=1, dest='acbs_dump_dir',
+                        help='Override cache directory')
+    parser.add_argument('-o', '--log-dir', nargs=1, dest='acbs_log_dir',
+                        help='Override log directory')
+    parser.add_argument('-b', '--tree-dir', nargs=1, dest='acbs_tree_dir',
+                        help='Override abbs tree directory')
+    parser.add_argument('-z', '--temp-dir', nargs=1, dest='acbs_temp_dir',
+                        help='Override temp directory')
+
     args = parser.parse_args()
     if args.clear_dir:
         clear_tmp(tmp_dir=tmp_loc)
diff --git a/acbs/main.py b/acbs/main.py
index 63d28af..b0b5662 100644
--- a/acbs/main.py
+++ b/acbs/main.py
@@ -81,12 +81,23 @@ def __init__(self, args) -> None:
         # static vars
         self.autobuild_conf_dir = AUTOBUILD_CONF_DIR
         self.conf_dir = CONF_DIR
-        self.dump_dir = DUMP_DIR
-        self.tmp_dir = TMP_DIR
-        self.log_dir = LOG_DIR
+        if args.acbs_dump_dir is not None:
+            self.dump_dir = args.acbs_dump_dir[0]
+        else:
+            self.dump_dir = DUMP_DIR
+        if args.acbs_temp_dir is not None:
+            self.tmp_dir = args.acbs_temp_dir[0]
+        else:
+            self.tmp_dir = TMP_DIR
+        if args.acbs_log_dir is not None:
+            self.log_dir = args.acbs_log_dir[0]
+        else:
+            self.log_dir = LOG_DIR
         self.stage2 = is_in_stage2()
         if args.acbs_tree:
             self.tree = args.acbs_tree[0]
+        if args.acbs_tree_dir is not None:
+            self.tree_dir = args.acbs_tree_dir[0]
         self.init()
 
     def init(self) -> None:
@@ -105,13 +116,15 @@ def init(self) -> None:
         except Exception:
             raise IOError('\033[93mFailed to create work directories\033[0m!')
         self.__install_logger(log_verbosity)
-        forest_file = os.path.join(self.conf_dir, 'forest.conf')
-        if os.path.exists(forest_file):
-            self.tree_dir = get_tree_by_name(forest_file, self.tree)
-            if not self.tree_dir:
-                raise ValueError('Tree not found!')
-        else:
-            raise Exception('forest.conf not found')
+        if self.tree_dir is None:
+            # If the user did not specify tree path via -b/--tree-dir, read from config
+            forest_file = os.path.join(self.conf_dir, 'forest.conf')
+            if os.path.exists(forest_file):
+                self.tree_dir = get_tree_by_name(forest_file, self.tree)
+                if not self.tree_dir:
+                    raise ValueError('Tree not found!')
+            else:
+                raise Exception('forest.conf not found')
 
     def __install_logger(self, str_verbosity=logging.INFO,
                          file_verbosity=logging.DEBUG):