Commit: 039fbfdedb3720c1a0aed913b7c6fa91fd84262d - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 039fbfdedb3720c1a0aed913b7c6fa91fd84262d (tree)
• Zeit: 2013-09-20 05:15:27
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052)

Ändern Zusammenfassung

• modified: ChangeLog
• modified: src/pkgexec.cpp

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-09-19  Keith Marshall  <[e-mail]>
 
+	Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052)
+
+	* src/pkgexec.cpp (LUA_LIBEXEC_PATH): New manifest string; define it.
+	(init_lua_path) <LUA_PATH>: Use it; add guimain.exe app directory.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Handle meta-package removal correctly; (cf. MinGW-Bug #2051)
 
 	* src/pkgunst.cpp (pkgRemove) [archive == none]: Ensure the pending

--- a/src/pkgexec.cpp
+++ b/src/pkgexec.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009, 2010, 2011, 2012, 2013, MinGW.org Project
+ * Copyright (C) 2009-2013, MinGW.org Project
  *
  *
  * Implementation of package management task scheduler and executive.
@@ -752,12 +752,13 @@ static const char *action_key = "action";
 static const char *normal_key = "normal";
 
 static inline __attribute__((__always_inline__)) bool init_lua_path()
+# define LUA_LIBEXEC_PATH  "\\libexec\\mingw-get\\?.lua"
 {
   /* A one time initialisation hook, to ensure that the built-in Lua script
    * interpreter will load scripts from the libexec directory associated with
    * the running mingw-get.exe instance.
    */
-  putenv( "LUA_PATH=!\\libexec\\mingw-get\\?.lua;!\\..\\libexec\\mingw-get\\?.lua" );
+  putenv( "LUA_PATH=!\\?.lua;!"LUA_LIBEXEC_PATH";!\\.."LUA_LIBEXEC_PATH );
   return true;
 }