diff -rupN a/flowblade-trunk/flowblade b/flowblade-trunk/flowblade --- a/flowblade-trunk/flowblade 2017-10-04 14:31:30.000000000 +0200 +++ b/flowblade-trunk/flowblade 2018-02-17 18:56:31.302010091 +0100 @@ -26,22 +26,10 @@ import sys print "FLOWBLADE MOVIE EDITOR 1.14" print "---------------------------" - -# Get launch script dir -launch_dir = os.path.dirname(os.path.abspath(sys.argv[0])) - -print "Launch script dir:", launch_dir - -# Update sys.path to include modules -if launch_dir == "/usr/bin": - print "Running from installation..." - modules_path = "/usr/share/flowblade/Flowblade" - if not os.path.isdir(modules_path): - modules_path = "/usr/share/pyshared/Flowblade" - print "modules path:", modules_path -else: - print "Running from filesystem..." - modules_path = launch_dir + "/Flowblade" +modules_path = "/usr/share/flowblade/Flowblade" +if not os.path.isdir(modules_path): + modules_path = "/usr/share/pyshared/Flowblade" +print "modules path:", modules_path sys.path.insert(0, modules_path) sys.path.insert(0, modules_path + "/vieweditor") @@ -64,10 +52,7 @@ except Exception, err: try: import app import editorstate - if launch_dir == "/usr/bin": - editorstate.app_running_from = editorstate.RUNNING_FROM_INSTALLATION - else: - editorstate.app_running_from = editorstate.RUNNING_FROM_DEV_VERSION + editorstate.app_running_from = editorstate.RUNNING_FROM_INSTALLATION except Exception, err: print "Failed to import module app.py to launch Flowblade!" print "ERROR:", err