Skip to content
This repository was archived by the owner on Nov 20, 2025. It is now read-only.

Commit e2e8755

Browse files
committed
Fixed resources finding + editing in output box
- Had to split resource localisation in method for packaged OSX or win32 app. They do it slightly differently - You could still enter text into the box which was only meant for output.... not anymore!
1 parent f79ac5b commit e2e8755

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

libdatamerger/datamerger_ui.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ def get_resource_loc(item):
5757
except:
5858
# If packaged with py2exe (but should also work for py2installer (not tested!) )
5959
basedir = os.path.dirname(unicode(sys.executable, sys.getfilesystemencoding( )))
60-
with open("output.txt","w") as f:
61-
f.write(basedir)
62-
return os.path.join(basedir, "../Resources/resources", item)
60+
if sys.platform == "win32":
61+
return os.path.join(basedir, "resources", item)
62+
elif sys.platform == "darwin":
63+
return os.path.join(basedir, "..", "Resources", "resources", item)
6364

6465
# For Linux when installed through a repo
6566
elif os.name == 'posix' and os.path.exists('/usr/share/datamerger/resources/'):

0 commit comments

Comments
 (0)