Update package names and import paths

diff --git a/config/config.go b/config/config.go
index 26443b2847d34b7ec696a2dc460a7d29a5676f4f..75a195b1792201df69c1e951062c72c26d79ecec 100644 (file)
--- a/config/config.go
+++ b/config/config.go
@@ -1,7 +1,7 @@
 //
 // Armadillo File Manager
 // Copyright (c) 2010, Robert Sesek <http://www.bluestatic.org>
-// 
+//
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
 // Foundation, either version 3 of the License, or any later version.

diff --git a/main.go b/main.go
index 4ef72dfe939dc051f980f808daa45ba77808c8cf..fec54113c1f2ca524220481d6a4927ca5d27a88b 100644 (file)
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 //
 // Armadillo File Manager
-// Copyright (c) 2010, Robert Sesek <http://www.bluestatic.org>
-// 
+// Copyright (c) 2010-2012, Robert Sesek <http://www.bluestatic.org>
+//
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
 // Foundation, either version 3 of the License, or any later version.
@@ -15,7 +15,6 @@ import (
        "os"
        "strings"
        "./config"
-       "./paths"
        "./server"
 )
 

diff --git a/server/paths.go b/server/paths.go
index ac5e25468592b41f15eb695f0cb89a6d5424b3f7..9b1d4f9bae8862b75aaa8ea167b7a6eaeeec0b38 100644 (file)
--- a/server/paths.go
+++ b/server/paths.go
@@ -1,20 +1,20 @@
 //
 // Armadillo File Manager
-// Copyright (c) 2010-2011, Robert Sesek <http://www.bluestatic.org>
+// Copyright (c) 2010-2012, Robert Sesek <http://www.bluestatic.org>
 //
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
 // Foundation, either version 3 of the License, or any later version.
 //
 
-package paths
+package server
 
 import (
        "container/vector"
        "os"
        "path"
        "strings"
-       "./config"
+       "../config"
 )
 
 var gConfig *config.Configuration

diff --git a/server/server.go b/server/server.go
index 7da8aae510a1b45a034aadd7edac4c6386761301..1dbbbe90f0b2b303ed12f2845ce572250db7ee35 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -19,9 +19,7 @@ import (
        "path"
        "strings"
        "url"
-       "./config"
-       "./paths"
-       "./tv_rename"
+       "../config"
 )
 
 var dir, file = path.Split(path.Clean(os.Getenv("_")))

diff --git a/server/tv_rename.go b/server/tv_rename.go
index 62cfd930d27b97d757754c8d5ad102c06cb41e93..b8d0704fe3c6f89ad1108fee71fec88c1ad9209a 100644 (file)
--- a/server/tv_rename.go
+++ b/server/tv_rename.go
@@ -1,13 +1,13 @@
 //
 // Armadillo File Manager
-// Copyright (c) 2011, Robert Sesek <http://www.bluestatic.org>
-// 
+// Copyright (c) 2011-2012, Robert Sesek <http://www.bluestatic.org>
+//
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
 // Foundation, either version 3 of the License, or any later version.
 //
 
-package tv_rename
+package server
 
 import (
        "bufio"