From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 10 Sep 2012 01:48:09 +0000 (-0400)
Subject: fixed erroneous belief that iar and oar are zips; they are tar format instead.
X-Git-Tag: 2.140.90~1248
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=26ec1dc25e8142729a1ebf3058d48289e2548a50;p=feisty_meow.git

fixed erroneous belief that iar and oar are zips; they are tar format instead.
removed a few references to TEMP or TMP.  need a major overhaul to refer to TMP
uniformly.
---

diff --git a/nucleus/library/configuration/variable_tokenizer.h b/nucleus/library/configuration/variable_tokenizer.h
index 82b08357..34588a66 100644
--- a/nucleus/library/configuration/variable_tokenizer.h
+++ b/nucleus/library/configuration/variable_tokenizer.h
@@ -94,7 +94,7 @@ public:
     possible by using the current separator and assignment characters.  
     E.G.: if the separator is ';' and the assignment character
     is '=', then one's string would look something like: @code
-      TEMP=c:\tmp; GLOB=c:\glob.exe; ....  @endcode
+      state_folder=/home/fred/state; GLOB=/usr/bin/glob.exe; ....  @endcode
     whitespace is ignored if it's found (1) after a separator and before
     the next variable name, (2) after the variable name and before the
     assignment character, (3) after the assignment character and before the
diff --git a/nucleus/library/processes/process_control.cpp b/nucleus/library/processes/process_control.cpp
index ce0dbf03..96485c8c 100644
--- a/nucleus/library/processes/process_control.cpp
+++ b/nucleus/library/processes/process_control.cpp
@@ -507,7 +507,7 @@ bool process_control::get_processes_with_toolhelp(process_entry_array &to_fill)
 
 #ifdef __UNIX__
 
-#define CLOSE_TMP_FILE { \
+#define CLOSE_TEMPORARY_FILE { \
 /*  continuable_error("process_control", "get_processes_with_ps", error); */ \
   if (output) { \
     fclose(output); \
@@ -528,13 +528,13 @@ bool process_control::get_processes_with_ps(process_entry_array &to_fill)
   int sysret = system(cmd.s());
   if (negative(sysret)) {
 LOG("got negative return from system()!");
-    CLOSE_TMP_FILE;
+    CLOSE_TEMPORARY_FILE;
     return false;
   }
   output = fopen(tmpfile.s(), "r");
   if (!output) {
 LOG("failed to open process list file!");
-    CLOSE_TMP_FILE;
+    CLOSE_TEMPORARY_FILE;
     return false;
   }
   const int max_buff = 10000;
@@ -548,7 +548,7 @@ LOG("failed to open process list file!");
     if (size_read > 0)
       accumulator += astring(astring::UNTERMINATED, buff, size_read);
   }
-  CLOSE_TMP_FILE;
+  CLOSE_TEMPORARY_FILE;
   // parse the string up now.
   bool first_line = true;
   while (accumulator.length()) {
diff --git a/nucleus/library/processes/rendezvous.cpp b/nucleus/library/processes/rendezvous.cpp
index 3f3385e8..46545a30 100644
--- a/nucleus/library/processes/rendezvous.cpp
+++ b/nucleus/library/processes/rendezvous.cpp
@@ -59,10 +59,7 @@ astring unix_rendez_file(const astring &lock_name)
   filename::detooth_filename(clean_name);
   // make sure our target directory exists.
 
-  // this choice is only user specific.
-//  astring tmp_dir = portable::env_string("TMP") + "/rendezvous";
-
-  // this choice uses a system-wide location.
+  // use a system-wide location for rendezvous state files.
   astring tmp_dir = "/tmp/rendezvous";
 
   mkdir(tmp_dir.observe(), 0777);
diff --git a/scripts/archival/unpack.sh b/scripts/archival/unpack.sh
index 933f8f0a..f5c2aa93 100644
--- a/scripts/archival/unpack.sh
+++ b/scripts/archival/unpack.sh
@@ -54,13 +54,16 @@ fi
 if [[ $unpack_file =~ .*\.tar$ \
     || $unpack_file =~ .*\.tar\.gz$ \
     || $unpack_file =~ .*\.tar\.bz2$ \
-    || $unpack_file =~ .*\.tgz$ ]]; then
+    || $unpack_file =~ .*\.iar$ \
+    || $unpack_file =~ .*\.oar$ \
+    || $unpack_file =~ .*\.tgz$ \
+    ]]; then
   tar -xf $unpack_file &>/dev/null
 elif [[ $unpack_file =~ .*\.zip$ \
     || $unpack_file =~ .*\.odt$ \
     || $unpack_file =~ .*\.jar$ \
-    || $unpack_file =~ .*\.iar$ \
-    || $unpack_file =~ .*\.oar$ ]]; then
+    || $unpack_file =~ .*\.war$ \
+    ]]; then
   unzip $unpack_file &>/dev/null
 fi
 save_err=$?