awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'find-fallback-config' of https://github.com/psychon/awesome

This commit is contained in:
Uli Schlachter 2017-01-27 17:39:30 +01:00
parent f22fc67fb5 9922c3c8e9
commit de4715cacd
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -24,9 +24,6 @@ include_directories(
set(CHECK_TARGETS check-integration) set(CHECK_TARGETS check-integration)
set(AWE_CONF_FILE_DEFAULT ${BUILD_DIR}/awesomerc.lua)
set(AWE_CONF_FILE rc.lua)
set(AWE_ICON_DIR ${SOURCE_DIR}/icons) set(AWE_ICON_DIR ${SOURCE_DIR}/icons)
set(AWE_THEMES_DIR ${SOURCE_DIR}/themes) set(AWE_THEMES_DIR ${SOURCE_DIR}/themes)
@ -354,8 +351,8 @@ install(TARGETS ${PROJECT_AWE_NAME} RUNTIME DESTINATION bin)
install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH} install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH}
PATTERN "*.in" EXCLUDE) PATTERN "*.in" EXCLUDE)
install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR} install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
RENAME ${AWE_CONF_FILE}) RENAME rc.lua)
if(GENERATE_MANPAGES) if(GENERATE_MANPAGES)
if(COMPRESS_MANPAGES) if(COMPRESS_MANPAGES)
set(regex "\\.(xml|txt|[0-9])$") set(regex "\\.(xml|txt|[0-9])$")

1
config.h
View File

@ -6,6 +6,7 @@
#define AWESOME_IS_BIG_ENDIAN @AWESOME_IS_BIG_ENDIAN@ #define AWESOME_IS_BIG_ENDIAN @AWESOME_IS_BIG_ENDIAN@
#define AWESOME_THEMES_PATH "@AWESOME_THEMES_PATH@" #define AWESOME_THEMES_PATH "@AWESOME_THEMES_PATH@"
#define AWESOME_ICON_PATH "@AWESOME_ICON_PATH@" #define AWESOME_ICON_PATH "@AWESOME_ICON_PATH@"
#define AWESOME_DEFAULT_CONF "@AWESOME_SYSCONFDIR@/rc.lua"
#cmakedefine WITH_DBUS #cmakedefine WITH_DBUS
#cmakedefine HAS_EXECINFO #cmakedefine HAS_EXECINFO

7
luaa.c
View File

@ -907,8 +907,13 @@ luaA_find_config(xdgHandle* xdg, const char *confpatharg, luaA_config_callback *
} }
tmp += a_strlen(tmp) + 1; tmp += a_strlen(tmp) + 1;
} }
p_delete(&confpath); p_delete(&confpath);
if(callback(AWESOME_DEFAULT_CONF))
{
return a_strdup(AWESOME_DEFAULT_CONF);
}
return NULL; return NULL;
} }