From 993df06c118a1f09e80652a78d4f2840f95b3667 Mon Sep 17 00:00:00 2001
From: Taka <taka@vm-linux-dev>
Date: Wed, 3 May 2017 01:54:26 +0000
Subject: [PATCH] Changed the way we locate the natinfo/ directory.

---
 _freeze.py | 2 +-
 main.py    | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/_freeze.py b/_freeze.py
index 72a2d11..97eee6a 100644
--- a/_freeze.py
+++ b/_freeze.py
@@ -26,7 +26,7 @@ extra_files.extend( get_extra_files( "index/*.txt" ) )
 extra_files.extend( get_extra_files( "resources/*.ico" ) )
 extra_files.extend( get_extra_files( "resources/*.png" ) )
 extra_files.extend( get_extra_files( "ui/*.ui" ) )
-extra_files.extend( get_extra_files( "natinfo/*" ) )
+# nb: we need the natinfo directory, but it gets pulled in as part of the asl_cards module.
 build_options = {
     "packages": [ "os" , "sqlalchemy" ] ,
     "excludes": [ "tkinter" ] ,
diff --git a/main.py b/main.py
index 093f282..0f5c523 100755
--- a/main.py
+++ b/main.py
@@ -55,11 +55,9 @@ def do_main( args ) :
     globals.debug_settings = QSettings( fname , QSettings.IniFormat )
 
     # initialize
-    dname = os.path.join( globals.base_dir , "natinfo" )
-    if not os.path.isdir( dname ) :
-        # nb: for a dev environment (or you can create a symlink natinfo -> asl_cards/natinfo)
-        dname = os.path.join( globals.base_dir , "asl_cards/natinfo" )
-    natinfo.load( dname )
+    natinfo.load(
+        os.path.join( globals.base_dir , "asl_cards/natinfo" )
+    )
 
     # do main processing
     app = QApplication( sys.argv )