shortcut links now to the "real" location

Chromatic-Vision · Jun 12, 2023 · a82b9c6 · a82b9c6
1 parent 90de679
commit a82b9c6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/flashbox.py b/flashbox.py
@@ -7,6 +7,7 @@
 import json
 import os
 import platform
+import sys
 import webbrowser
 import pygame
 import random
@@ -68,18 +69,22 @@ def __init__(self, screen: pygame.Surface):
 
         self.tournament_mode = False
 
+
+
     def create_shortcut(self):
 
-        import main
+        original_exec_file_name = sys.argv[0]
+
+        logger.log(f"Creating desktop shortcut that links to {original_exec_file_name}")
 
         if platform.system() == "Windows":
             try:
                 import winshell
                 from win32com.client import Dispatch
 
                 path = os.path.join(os.path.join(os.environ["USERPROFILE"]), "Desktop") + "\\Flashbox.lnk"
-                target = os.path.abspath(main.__file__)
-                work_dir = os.path.dirname(os.path.abspath(main.__file__))
+                target = os.path.abspath(original_exec_file_name)
+                work_dir = os.path.dirname(os.path.abspath(original_exec_file_name))
 
                 shell = Dispatch('WScript.Shell')
                 shortcut = shell.CreateShortCut(path)
@@ -90,7 +95,7 @@ def create_shortcut(self):
             except ModuleNotFoundError:
                 try:
                     path = Path(os.path.join(os.path.join(os.environ["USERPROFILE"]), "Desktop") + "\\Flashbox.lnk")
-                    target = Path(os.path.abspath(main.__file__))
+                    target = Path(os.path.abspath(original_exec_file_name))
 
                     path.symlink_to(target)
                 except Exception as e:
@@ -101,7 +106,7 @@ def create_shortcut(self):
         else:
             try:
                 link = Path("~/Desktop/Flashbox")
-                target = Path(os.path.realpath(main.__file__))
+                target = Path(os.path.realpath(original_exec_file_name))
 
                 link.symlink_to(target)
             except Exception as e:

diff --git a/main.py b/main.py
@@ -16,6 +16,8 @@
 screen = pygame.display.set_mode(size, pygame.RESIZABLE)
 size = screen.get_size()
 
+f = flashbox.Flashbox(screen)
+
 FPS = 60
 clock = pygame.time.Clock()
 
@@ -27,7 +29,6 @@
 
 run = 1
 
-f = flashbox.Flashbox(screen)
 f.load()
 
 class PeriodicSleeper(threading.Thread):