RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

rework PREFIX for future make install

Browse source
This commit is contained in:
Philippe Teuwen 2019-08-23 20:55:50 +02:00
parent 4b2b103e80
commit c709ee7c10
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/fileutils.c
View file

@ -654,8 +654,8 @@ int searchAndList(const char *pm3dir, const char *ext) {
filelist(script_directory_path, ext, false);
}
{
char script_directory_path[strlen(PM3_SYSTEM_DIRECTORY) + strlen(pm3dir) + 1];
strcpy(script_directory_path, PM3_SYSTEM_DIRECTORY);
char script_directory_path[strlen(PM3_SHARE_PATH) + strlen(pm3dir) + 1];
strcpy(script_directory_path, PM3_SHARE_PATH);
strcat(script_directory_path, pm3dir);
filelist(script_directory_path, ext, true);
}
@ -711,8 +711,8 @@ char *searchFile(const char *pm3dir, const char *ext, const char *filename) {
}
// try pm3 dirs in pm3 installation dir (install mode)
{
char *path = malloc(strlen(PM3_SYSTEM_DIRECTORY) + strlen(pm3dir) + strlen(filename) + strlen(suffix) + 1);
strcpy(path, PM3_SYSTEM_DIRECTORY);
char *path = malloc(strlen(PM3_SHARE_PATH) + strlen(pm3dir) + strlen(filename) + strlen(suffix) + 1);
strcpy(path, PM3_SHARE_PATH);
strcat(path, pm3dir);
strcat(path, filename);
strcat(path, suffix);

10
client/scripting.c
View file

@ -1167,16 +1167,16 @@ int set_pm3_libraries(lua_State *L) {
setLuaPath(L, libraries_path);
}
if (strlen(PM3_SYSTEM_DIRECTORY) != 0 || strlen(LUA_SCRIPTS_DIRECTORY) != 0 || strlen(LUA_LIBRARIES_WILDCARD) != 0 ) {
if (strlen(PM3_SHARE_PATH) != 0 || strlen(LUA_SCRIPTS_DIRECTORY) != 0 || strlen(LUA_LIBRARIES_WILDCARD) != 0 ) {
// from the /usr/local/share/proxmark3/luascripts/ directory
char scripts_path[strlen(PM3_SYSTEM_DIRECTORY) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
strcpy(scripts_path, PM3_SYSTEM_DIRECTORY);
char scripts_path[strlen(PM3_SHARE_PATH) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
strcpy(scripts_path, PM3_SHARE_PATH);
strcat(scripts_path, LUA_SCRIPTS_DIRECTORY);
strcat(scripts_path, LUA_LIBRARIES_WILDCARD);
setLuaPath(L, scripts_path);
// from the /usr/local/share/proxmark3/lualib/ directory
char libraries_path[strlen(PM3_SYSTEM_DIRECTORY) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
strcpy(libraries_path, PM3_SYSTEM_DIRECTORY);
char libraries_path[strlen(PM3_SHARE_PATH) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
strcpy(libraries_path, PM3_SHARE_PATH);
strcat(libraries_path, LUA_LIBRARIES_DIRECTORY);
strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
setLuaPath(L, libraries_path);

7
doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md
View file

@ -64,12 +64,7 @@ These instructions will show how to setup the environment on OSX to the point wh
2. Install dependencies:
```
brew install readline
brew install p7zip
brew install libusb-compat
brew install perl
brew install qt5
brew install wget
brew install readline p7zip libusb-compat perl qt5 wget
brew install RfidResearchGroup/proxmark3/arm-none-eabi-gcc
```

10
include/common.h
View file

@ -16,10 +16,14 @@
#include <stddef.h>
#include <stdbool.h>
#ifndef PREFIX
# define PREFIX "/usr/local/"
// brew prefixes are a bit weird so we've to split bin & share to be prepared:
#ifndef PM3_BIN_PATH
# define PM3_BIN_PATH "/usr/local/bin/"
#endif
#define PM3_SYSTEM_DIRECTORY PREFIX "share/proxmark3/"
#ifndef PM3_SHARE_PATH
# define PM3_SHARE_PATH "/usr/local/share/proxmark3/"
#endif
// PM3_USER_DIRECTORY will be expanded as if with a "~" upfront, e.g. ~/.proxmark3/
#define PM3_USER_DIRECTORY "/.proxmark3/"
#define PACKED __attribute__((packed))