From 63f3d717da20b7c885b54bd03bef0ab37e356ef5 Mon Sep 17 00:00:00 2001
From: JoshuaMKW <60854312+JoshuaMKW@users.noreply.github.com>
Date: Tue, 25 Aug 2020 21:59:19 -0500
Subject: [PATCH] Path stuff

---
 GeckoLoader.py |  2 +-
 installer.cs   | 22 ++++------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/GeckoLoader.py b/GeckoLoader.py
index 6ef6f72..d76f4b4 100644
--- a/GeckoLoader.py
+++ b/GeckoLoader.py
@@ -37,7 +37,7 @@ __version__ = 'v6.0.0'
 
 def resource_path(relative_path: str):
     """ Get absolute path to resource, works for dev and for PyInstaller """
-    base_path = getattr(sys, '_MEIPASS', os.path.dirname(os.path.abspath(__file__)))
+    base_path = os.path.dirname(os.path.realpath(sys.argv[0]))
     return os.path.join(base_path, relative_path)
     
 def sort_file_args(fileA, fileB):
diff --git a/installer.cs b/installer.cs
index 5f2a98e..c961a8e 100644
--- a/installer.cs
+++ b/installer.cs
@@ -90,13 +90,11 @@ public class Installer
 
     private void SetProgramFolder(string folderName)
     {
-        this.programfolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), folderName);
+        this.programfolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "GeckoLoader", "bin");
     }
 
     private void SetProgramFolderToPath()
     {
-        if (!Directory.Exists(this.programfolder)) Directory.CreateDirectory(this.programfolder);
-
         var scope = EnvironmentVariableTarget.User;
         var curPATH = Environment.GetEnvironmentVariable("PATH", scope);
 
@@ -121,10 +119,10 @@ public class Installer
 
     private bool MoveFilesToprogramfolder(string wildcard, bool copy = true, bool overwrite = false)
     {
-        DirectoryInfo cwd = new DirectoryInfo(Path.Combine(Directory.GetCurrentDirectory()));
+        DirectoryInfo cwd = new DirectoryInfo(Path.Combine(Directory.GetCurrentDirectory(), "bin"));
         DirectoryInfo programspace = new DirectoryInfo(this.programfolder);
 
-        bool validinstall = false;
+        if (!programspace.Exists) programspace.Create();
 
         try
         {
@@ -137,18 +135,6 @@ public class Installer
                 dir.Delete(true);
             }
 
-            //Copy top level files
-            foreach (FileInfo file in cwd.EnumerateFiles(wildcard, SearchOption.TopDirectoryOnly))
-            {
-                string ext = ".exe.py.bin.dll";
-
-                if (ext.Contains(file.Extension.ToLower()))
-                {
-                    if (file.Extension.ToLower() == ".exe" && file.Name != "GeckoLoader.exe") continue;
-                    if (file.Name.ToLower() == "geckoloader.py" || file.Name.ToLower() == "geckoloader.exe") validinstall = true;
-                    file.CopyTo(Path.Combine(programspace.FullName, file.Name), true);
-                }
-            }
             //Copy dependancies
             string[] exclude = { "installer.exe" };
             this.CopyAll(cwd, programspace, wildcard, exclude);
@@ -159,7 +145,7 @@ public class Installer
             return false;
         }
 
-        return validinstall;
+        return true;
     }
 
     private void DeleteProgramFolder()