Username404-59
/
Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the right installation directories.

This commit is contained in:
Username404-59 2021-03-03 13:24:16 +01:00
parent d42c0d4293
commit 4d8f09ee68
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -80,10 +80,10 @@ if (UNIX AND NOT MINGW)
endif() endif()
install(PROGRAMS install(PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/ybcon ${CMAKE_CURRENT_BINARY_DIR}/ybcon
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ybcon.d) DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/completions DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ybcon.d) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts/completions DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ybcon.d)
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ybcon install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ybcon
DESTINATION ${CMAKE_INSTALL_BINDIR}) DESTINATION yerbacon/${CMAKE_INSTALL_BINDIR})
endif() endif()
elseif(MINGW OR MSVC) elseif(MINGW OR MSVC)
set(CMAKE_EXE_LINKER_FLAGS "-static -static-libstdc++ ${CMAKE_EXE_LINKER_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "-static -static-libstdc++ ${CMAKE_EXE_LINKER_FLAGS}")

1
scripts/postinst.sh
View File

@ -3,6 +3,7 @@
# Post install ybcon script # Post install ybcon script
ybconDir="/opt/etc/ybcon.d" ybconDir="/opt/etc/ybcon.d"
ln -sf "/opt/yerbacon/bin/ybcon" "/usr/bin/ybcon"
fishLoc="/usr/share/fish/vendor_completions.d" fishLoc="/usr/share/fish/vendor_completions.d"
bashcompleteLoc="/etc/bash_completion.d" bashcompleteLoc="/etc/bash_completion.d"
zshLoc="/etc/zsh_completion.d" zshLoc="/etc/zsh_completion.d"

2
scripts/ybcon
View File

@ -5,7 +5,7 @@
EXENAME=ybcon EXENAME=ybcon
# Default location of the executable # Default location of the executable
defaultBinLocation=/opt/etc/ybcon.d/ybcon defaultBinLocation=/opt/libexec/ybcon
usage() { usage() {
if [ "$1" = false ]; then echo "Invalid arguments, usage:"; fi if [ "$1" = false ]; then echo "Invalid arguments, usage:"; fi

3
src/etc/lexer.cpp
View File

@ -54,7 +54,8 @@ vector<tok>& lex(const string& in)
case tok::STRING: { case tok::STRING: {
generated.first = type; generated.first = type;
longLex = true; longLex = true;
}; break; break;
}
default: resVal.emplace_back(type, string(1, current)); default: resVal.emplace_back(type, string(1, current));
} }
break; break;