changeset 13834:227130df89eb

prefsfile.m: Use .octave_prefs for preferences filename * prefsfile.m: Use .octave_prefs for preferences filename. Add code to transition users to new name.
author Rik <octave@nomad.inbox5.com>
date Sun, 06 Nov 2011 15:13:37 -0800
parents 0a28c49cb477
children fc9f34e17486
files scripts/prefs/private/prefsfile.m
diffstat 1 files changed, 20 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/prefs/private/prefsfile.m	Sun Nov 06 20:08:17 2011 +0000
+++ b/scripts/prefs/private/prefsfile.m	Sun Nov 06 15:13:37 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