changed history file location

M2/Macaulay2/m2/Core.m2

@@ -119,16 +119,16 @@ needs = filename -> if not filesLoaded#?filename then load filename else (
 -----------------------------------------------------------------------------
 -- Setup persistent history
 -----------------------------------------------------------------------------
-historyFilename = "~/.Macaulay2-history"
+historyFilename = "history.m2"
 
-if not gotarg "--no-readline" then (
-    addStartFunction(() -> readHistory historyFilename);
+if not noinitfile and not gotarg "--no-readline" then (
+    addStartFunction(() -> readHistory(applicationDirectory() | historyFilename));
     -- TODO: find a better alternative to addEndFunction, because
     -- exiting with Ctrl+D duplicates the last line of history file,
     -- but if we use lineNumber-1, then exit and restart miss the first
     -- entry from the current session. Moreover, maybe we shouldn't save
     -- exit and restart in the history anyway.
-    addEndFunction(() -> appendHistory(lineNumber, historyFilename));
+    addEndFunction(() -> appendHistory(lineNumber, applicationDirectory() | historyFilename));
     )
 
 -----------------------------------------------------------------------------

M2/Macaulay2/m2/system.m2

@@ -112,6 +112,9 @@ setUpApplicationDirectory = () -> (
      f := (n,c) -> (n = dir|n; if not fileExists n then n << c << close);
      f("init.m2", sampleInitFile);
      f("README", readmeFile);
+     f(historyFilename, concatenate(
+	     "-- This is the beginning of your Macaulay2 log stored at ",
+	     dir, historyFilename, newline));
      )
 
 -----------------------------------------------------------------------------