Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index 8d77c78a2e4a2b9aef6aae0b075a62c1910fc608..10d554a07082a9dab2e237d7324f689b0797b309 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -161,7 +161,7 @@ static int l_nonce2key(lua_State *L){
        uint8_t dest_key[8];
        num_to_bytes(key,sizeof(dest_key),dest_key);
 
-       //printf("Pushing to lua stack: %012"llx"\n",key);
+       //printf("Pushing to lua stack: %012" PRIx64 "\n",key);
        lua_pushlstring(L,(const char *) dest_key,sizeof(dest_key));
 
        return 2; //Two return values
@@ -536,7 +536,11 @@ int set_pm3_libraries(lua_State *L)
 
        //-- Last but not least, add to the LUA_PATH (package.path in lua)
        // so we can load libraries from the ./lualib/ - directory
-       setLuaPath(L,"./lualibs/?.lua");
+       char libraries_path[strlen(get_my_executable_directory()) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
+       strcpy(libraries_path, get_my_executable_directory());
+       strcat(libraries_path, LUA_LIBRARIES_DIRECTORY);
+       strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
+       setLuaPath(L, libraries_path);
 
        return 1;
 }