Skip to content

Commit

Permalink
Bump to 0.10.0, add branch info
Browse files Browse the repository at this point in the history
  • Loading branch information
Slackadays committed Nov 10, 2024
1 parent a037cc4 commit cc00a8d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20)

project(Clipboard LANGUAGES CXX C VERSION 0.9.1)
project(Clipboard LANGUAGES CXX C VERSION 0.10.0)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED True)

Expand Down
5 changes: 5 additions & 0 deletions src/cb/src/clipboard.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ namespace fs = std::filesystem;
#define GIT_COMMIT_HASH "not available"
#endif

#if !defined(GIT_BRANCH)
#define GIT_BRANCH "not available"
#endif

#if !defined(CLIPBOARD_VERSION)
#define CLIPBOARD_VERSION "(version not available)"
#endif
Expand All @@ -82,6 +86,7 @@ extern GlobalFilepaths global_path;
struct Constants {
std::string_view clipboard_version = CLIPBOARD_VERSION;
std::string_view clipboard_commit = GIT_COMMIT_HASH;
std::string_view clipboard_branch = GIT_BRANCH;
std::string_view data_file_name = "rawdata.clipboard";
std::string_view persistent_directory_name = ".local/state/clipboard";
std::string_view original_files_name = "originals";
Expand Down
2 changes: 1 addition & 1 deletion src/cb/src/locales/en_us.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ EnumArray<std::string_view, 23> action_descriptions = {
"Set a script to run for this clipboard.",
"Share a clipboard with others."};

Message help_message = "[info]┃ This is the Clipboard Project %s (commit %s), the cut, copy, and paste system for the command line.[blank]\n"
Message help_message = "[info]┃ This is the Clipboard Project %s (commit %s, branch %s), the cut, copy, and paste system for the command line.[blank]\n"
"[info][bold]┃ Examples[blank]\n"
"[progress]┃ cb ct Nuclear_Launch_Codes.txt contactsfolder[blank] [help](This cuts the following items into the "
"default clipboard, 0.)[blank]\n"
Expand Down
2 changes: 1 addition & 1 deletion src/cb/src/locales/es_co.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void setLanguageES_CO() {
action_descriptions[Ignore] = "Ignora contenido en un portapapeles.";
action_descriptions[Search] = "Busca contenido en un portapapeles.";

help_message = "[info]┃ Esto es Clipboard Project %s (commit %s), el sistema para cortar, copiar y pegar adentro del "
help_message = "[info]┃ Esto es Clipboard Project %s (commit %s, branch %s), el sistema para cortar, copiar y pegar adentro del "
"terminal.[blank]\n"
"[info][bold]┃ Cómo usar[blank]\n"
"[progress]┃ cb cortar (cosa) [cosas][blank]\n"
Expand Down
2 changes: 1 addition & 1 deletion src/cb/src/locales/es_do.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void setLanguageES_DO() {
action_descriptions[Ignore] = "Ignora contenido en un portapapeles.";
action_descriptions[Search] = "Busca contenido en un portapapeles.";

help_message = "[info]┃ Esto es Clipboard Project %s (commit %s), el sistema para cortar, copiar y pegar adentro del "
help_message = "[info]┃ Esto es Clipboard Project %s (commit %s, branch %s), el sistema para cortar, copiar y pegar adentro del "
"terminal.[blank]\n"
"[info][bold]┃ Cómo usar[blank]\n"
"[progress]┃ cb cortar (cosa) [cosas][blank]\n"
Expand Down
2 changes: 1 addition & 1 deletion src/cb/src/locales/pt_br.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void setLanguagePT() {
action_descriptions[Ignore] = "Ignora um item ou itens do clipboard.";
action_descriptions[Search] = "Busca um item ou itens do clipboard.";

help_message = "[info]┃ Este é Clipboard Project %s (commit %s), o sistema de recortar, copiar e colar para a linha de "
help_message = "[info]┃ Este é Clipboard Project %s (commit %s, branch %s), o sistema de recortar, copiar e colar para a linha de "
"comando.[blank]\n"
"[info][bold]┃ Como utilizar[blank]\n"
"[progress]┃ cb recortar (item) [itens][blank]\n"
Expand Down
2 changes: 1 addition & 1 deletion src/cb/src/locales/tr_tr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void setLanguageTR() {
action_descriptions[Ignore] = "Panodaki öğeyi yoksayar.";
action_descriptions[Search] = "Panodaki öğeleri arar.";

help_message = "[info]┃ Clipboard Project %s (commit %s), komut satırı için, kesme, kopyalama ve yapıştırma sistemidir.[blank]\n"
help_message = "[info]┃ Clipboard Project %s (commit %s, branch %s), komut satırı için, kesme, kopyalama ve yapıştırma sistemidir.[blank]\n"
"[info][bold]┃ Nasıl kullanılır[blank]\n"
"[progress]┃ cb kes (öğe) [öğeler][blank] [help](Bu öğe(leri) keser.)[blank]\n"
"[progress]┃ cb kopyala (öğe) [öğeler][blank] [help](Bu öğe(leri) kopyalar.)[blank]\n"
Expand Down
2 changes: 1 addition & 1 deletion src/cb/src/utils/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ void setFlags() {
.append(action_descriptions[static_cast<Action>(i)])
.append("[blank]\n");
}
printf(help_message().data(), constants.clipboard_version.data(), constants.clipboard_commit.data(), formatColors(actionsList).data());
printf(help_message().data(), constants.clipboard_version.data(), constants.clipboard_commit.data(), constants.clipboard_branch.data(), formatColors(actionsList).data());
exit(EXIT_SUCCESS);
}
}
Expand Down

0 comments on commit cc00a8d

Please sign in to comment.