From 1aa77c9ede85cd8c6e6231c7c43cebcd69b33ddc Mon Sep 17 00:00:00 2001
From: Julien Rabinow <jnr305@nyu.edu>
Date: Thu, 3 Dec 2020 01:29:36 -0800
Subject: [PATCH] fix home_dir variable definition

---
 src/CLI2.cpp    | 6 +-----
 src/CLI2.h      | 2 +-
 src/Context.cpp | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index c5fbd638c..56e7c1094 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -236,16 +236,12 @@ const char* getValue (int argc, const char** argv, std::string arg)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Static method.
-bool CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc)
+bool CLI2::getOverride (int argc, const char** argv, File& rc)
 {
   const char* value = getValue (argc, argv, "rc");
   if (value == nullptr)
     return false;
   rc = File (value);
-  if (rc._data.rfind ("/") != std::string::npos)
-    home = rc.parent ();
-  else
-    home = ".";
   return true;
 }
 
diff --git a/src/CLI2.h b/src/CLI2.h
index c3a4f4e18..f2d70e357 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -60,7 +60,7 @@ class CLI2
 public:
   static int minimumMatchLength;
 
-  static bool getOverride (int, const char**, std::string&, File&);
+  static bool getOverride (int, const char**, File&);
   static bool getDataLocation (int, const char**, Path&);
   static void applyOverrides (int, const char**);
 
diff --git a/src/Context.cpp b/src/Context.cpp
index 05470720e..1ec9daf97 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -440,6 +440,7 @@ int Context::initialize (int argc, const char** argv)
 {
   timer_total.start ();
   int rc = 0;
+  home_dir = getenv ("HOME");
 
   try
   {