From 6033904d0dce6be7cf01062b992b2371d11528c9 Mon Sep 17 00:00:00 2001
From: Elijah Perrault <elijah@starcoder.info>
Date: Fri, 11 Mar 2011 21:32:24 -0700
Subject: [PATCH] bin:lng, and moved some stuff to the correct locations.

---
 bin/auto | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/auto b/bin/auto
index 15e5b63..174f954 100755
--- a/bin/auto
+++ b/bin/auto
@@ -29,12 +29,15 @@ BEGIN {
         if (!-e "$Bin/lib/Lib/Auto.pm") {
             # Must be a system wide install.
             $bin{lib} = "$Bin/../lib/autobot/3.0.0";    
+            $bin{bld} = "$bin{lib}/build";
+            $bin{lng} = "$bin{lib}/lang";
         }
         else {
             # Or not.
             $bin{lib} = "$Bin/../lib";
+            $bin{bld} = "$Bin/../build";
+            $bin{lng} = "$Bin/../lang";
         }
-        $bin{bld} = "$bin{lib}/build";
     }
     else {
         # Must be a standard install.
@@ -42,6 +45,7 @@ BEGIN {
         $bin{var} = "$Bin/../var";
         $bin{lib} = "$Bin/../lib";
         $bin{bld} = "$Bin/../build";
+        $bin{lng} = "$Bin/../lang";
     }
 
     unshift @INC, $bin{lib};
@@ -257,14 +261,14 @@ given (lc((conf_get('database:format'))[0][0])) {
         # Import DBD::SQLite.
         require DBD::SQLite;
 
-        if (!-e "$Bin/../etc/".(conf_get('database:filename'))[0][0]) {
+        if (!-e "$bin{etc}/".(conf_get('database:filename'))[0][0]) {
             # Create <database:filename> if it's missing.
-            open my $dbfh, '>', "$Bin/../etc/".(conf_get('database:filename'))[0][0];
+            open my $dbfh, '>', "$bin{etc}/".(conf_get('database:filename'))[0][0];
             close $dbfh;
-            chmod 0755, "$Bin/../etc/".(conf_get('database:filename'))[0][0];
+            chmod 0755, "$bin{etc}/".(conf_get('database:filename'))[0][0];
         }
         # Connect to database.
-        $DB = DBI->connect("dbi:SQLite:dbname=$Bin/../etc/".(conf_get('database:filename'))[0][0]) or err(2, 'Failed to connect to database!', 1);
+        $DB = DBI->connect("dbi:SQLite:dbname=$bin{etc}/".(conf_get('database:filename'))[0][0]) or err(2, 'Failed to connect to database!', 1);
     }
     when ('mysql') {
         # MySQL.
@@ -298,7 +302,7 @@ given (lc((conf_get('database:format'))[0][0])) {
     #    require DBD::CSV;
     #
     #    # Connect to database.
-    #    $DB = DBI->connect("dbi:CSV:f_dir=$Bin/../etc/".(conf_get('database:dir'))[0][0]) or err(2, 'Failed to connect to database!', 1);
+    #    $DB = DBI->connect("dbi:CSV:f_dir=$bin{etc}/".(conf_get('database:dir'))[0][0]) or err(2, 'Failed to connect to database!', 1);
     #}
     when ('pgsql') {
         # PostgreSQL.