bump version

shiburizu · Jul 19, 2021 · f691035 · f691035
1 parent 7644528
commit f691035
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/config.py b/config.py
@@ -7,10 +7,11 @@
 else: #not frozen
     PATH = os.path.dirname(os.path.abspath(__file__)) + '\\'
     logging.basicConfig(filename= os.path.dirname(os.path.abspath(__file__)) + '\concerto.log', level=logging.DEBUG)
-if " " in PATH and len(sys.argv) > 1: #if there is a space (and we're being passed arguments from command line) in the path use the local folder as a bandaid. Only useful for ptyprocess.
+if " " in PATH: #if there is a space in the path use the local folder as a bandaid. Only useful for ptyprocess.
     PROCPATH = ""
 else:
     PROCPATH = PATH
+print('PROCPATH is %s' % PROCPATH)
 import configparser
 from kivy.config import Config
 from kivy.resources import resource_add_path
@@ -81,4 +82,4 @@
 
 LOBBYURL = "https://concerto-mbaacc.herokuapp.com/l"
 VERSIONURL = "https://concerto-mbaacc.herokuapp.com/v"
-CURRENT_VERSION = '7-17-2021'
+CURRENT_VERSION = '7-19-2021'
diff --git a/mbaacc.py b/mbaacc.py
@@ -154,9 +154,9 @@ def host(self, sc, port='0', mode="Versus"): #sc is a Screen for UI triggers
         self.app.offline_mode = None
         try:
             if mode == "Training":
-                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -t %s' % port, cwd = PATH) 
+                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -t %s' % port, cwd = PROCPATH) 
             else:
-                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n %s' % port, cwd = PATH) 
+                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n %s' % port, cwd = PROCPATH) 
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -231,7 +231,7 @@ def join(self, ip, sc, t=None, *args): #t is required by the Lobby screen to sen
         self.kill_caster()
         self.app.offline_mode = None
         try:
-            self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n %s' % ip, cwd = PATH)
+            self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n %s' % ip, cwd = PROCPATH)
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -306,7 +306,7 @@ def confirm_frames(self,rf,df):
     def watch(self, ip, sc, *args):
         self.kill_caster()
         try:
-            self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -s %s' % ip, cwd = PATH)
+            self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -s %s' % ip, cwd = PROCPATH)
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -354,9 +354,9 @@ def broadcast(self, sc, port='0', mode="Versus"): #sc is a Screen for UI trigger
         self.kill_caster()
         try:
             if mode == "Training":
-                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -b -t %s' % port, cwd = PATH) 
+                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -b -t %s' % port, cwd = PROCPATH) 
             else:
-                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -b %s' % port, cwd = PATH) 
+                self.aproc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe -n -b %s' % port, cwd = PROCPATH) 
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -380,7 +380,7 @@ def training(self,sc):
         self.kill_caster()
         self.startup = True
         try:
-            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PATH)
+            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PROCPATH)
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -405,7 +405,7 @@ def local(self,sc):
         self.kill_caster()
         self.startup = True
         try:
-            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PATH)
+            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PROCPATH)
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -428,7 +428,7 @@ def tournament(self,sc):
         self.kill_caster()
         self.startup = True
         try:
-            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PATH)
+            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PROCPATH)
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -451,7 +451,7 @@ def replays(self,sc):
         self.kill_caster()
         self.startup = True
         try:
-            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PATH)
+            proc = PtyProcess.spawn(PROCPATH + 'cccaster.v3.0.exe', cwd = PROCPATH)
         except FileNotFoundError:
             sc.error_message(['cccaster.v3.0.exe not found.'])
             return None
@@ -472,7 +472,7 @@ def replays(self,sc):
 
     def standalone(self,sc):
         self.kill_caster()
-        self.aproc = PtyProcess.spawn(PROCPATH + 'MBAA.exe', cwd = PATH)
+        self.aproc = PtyProcess.spawn(PROCPATH + 'MBAA.exe', cwd = PROCPATH)
         self.flag_offline(sc,stats=False)
 
     def flag_offline(self,sc,stats=True): #stats tells us whether or not to pull info from the game