snarf updated from experience with new config names, utils updated with higher stack...

[feisty_meow.git] / scripts / archival / snarf_opensim.pl

diff --git a/scripts/archival/snarf_opensim.pl b/scripts/archival/snarf_opensim.pl
index a24dace2fa047120101045093c0c0d1d5948d011..87f8ad70d81cfbd96a9b4270d3157222f3054c16 100644 (file)
--- a/scripts/archival/snarf_opensim.pl
+++ b/scripts/archival/snarf_opensim.pl
@@ -18,39 +18,40 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ###############################################################################
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;  # let the snarfer hook us in.
 
 # get the number attachment and increment it for the next use.
 local($number) = &retrieve_number("aa_backup");
 
 # variables used throughout here.
-local($base) = &snarf_prefix("opensim_config");
-local($snarf_file) = &snarf_name($base, $number);
+local($snarf_file_base) = &snarf_prefix("config-opensim");
+local($snarf_file) = &snarf_name($snarf_file_base, $number);
 
 # store the archive number in the file for retrieval on the other side.
-&backup_number("aa_backup", $base, $number);
+&backup_number("aa_backup", $snarf_file_base, $number);
 
 # the top directory where everything we're grabbing lives.
 local($root) = &canonicalize(&glob_list("$HOME/opensim"));
 
 # grab the top level stuff.
-#&backup_files($base, $number, $HOME, ".",
+#&backup_files($snarf_file_base, $number, $HOME, ".",
 #    ("*.sh"));
-&backup_files($base, $number, $root, ".",
+&backup_files($snarf_file_base, $number, $root, ".",
     ("*.sh"));
 
 # snag the main config files.
-&backup_files($base, $number, $root, "bin",
-    ("OpenSim.ini", "Robust.ini", "OpenSim.exe.config", "Robust.exe.config"));
+&backup_files($snarf_file_base, $number, $root, "bin",
+    ("OpenSim.ini", "Robust*.ini", "OpenSim.exe.config", "Robust.exe.config"));
 
 # snag the configuration include file.
-&backup_files($base, $number, $root, "bin/config-include", ("GridCommon.ini"));
+&backup_files($snarf_file_base, $number, $root, "bin/config-include", ("GridCommon.ini", "osslEnable.ini"));
 
 # get the region definitions.
-&backup_hierarchy($base, $number, "$root", "bin/Regions");
+&backup_hierarchy($snarf_file_base, $number, "$root", "bin/Regions");
 
 # now rename the file so only the unpacker can access it.
 &rename_archive($snarf_file);