# HG changeset patch
# User Rik <address@hidden>
# Date 1320595676 28800
# Node ID 24efeb3a798c64261ac16ea8e9a3d2090bf34d78
# Parent  2e4252228f73a956b824d792a554b92bcb7863a4
prefsfile.m: Use .octave_prefs for preferences filename

* prefsfile.m: Use .octave_prefs for preferences filename.
Add code to transition users to new name.

diff -r 2e4252228f73 -r 24efeb3a798c scripts/prefs/private/prefsfile.m
--- a/scripts/prefs/private/prefsfile.m	Sat Nov 05 13:46:15 2011 -0700
+++ b/scripts/prefs/private/prefsfile.m	Sun Nov 06 08:07:56 2011 -0800
@@ -25,7 +25,26 @@
 
 function retval = prefsfile ()
 
-  retval = "~/.octave-prefs";
+  retval = "~/.octave_prefs";
+
+  ## Transition users to new filename if necessary
+  ## FIXME: Delete before 3.6.0 release
+  oldname = tilde_expand ("~/.octave-prefs");
+  if (exist (oldname, "file"))
+    newname = tilde_expand (retval); 
+    if (exist (newname, "file"))
+      error (["Octave uses the file ~/.octave_prefs to store preferences.\n",...
+              "       The old file name was ~/.octave-prefs.\n",...
+              "       Both files exist."...
+              "  User must manually delete one of the files.\n"]);
+    endif
+    status = movefile (oldname, newname);
+    if (! status)
+      error (["Octave uses the file ~/.octave_prefs to store preferences.\n",
+             "        The old file name was ~/.octave-prefs.\n",
+             "        User must manually rename the old file to the new name.\n"]);
+    endif
+  endif
 
 endfunction