diff --git a/CMakeLists.txt b/CMakeLists.txt index e72610a..29bea3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ set(P_NAME "CacheCleaner") set(P_DESCRIPTION "CacheCleaner - console utility for clean usused trash files.Learn More at: https://github.com/SG123it/CacheCleaner") -set(P_VER 1.4) +set(P_VER 1.5) file(WRITE "version.txt" "${P_VER}") diff --git a/dependencies/LINUX/libc.so.6 b/dependencies/LINUX/libc.so.6 new file mode 100755 index 0000000..6728da0 Binary files /dev/null and b/dependencies/LINUX/libc.so.6 differ diff --git a/dependencies/LINUX/libcrypto.so.3 b/dependencies/LINUX/libcrypto.so.3 new file mode 100644 index 0000000..ec878ad Binary files /dev/null and b/dependencies/LINUX/libcrypto.so.3 differ diff --git a/dependencies/LINUX/libgcc_s.so.1 b/dependencies/LINUX/libgcc_s.so.1 new file mode 100644 index 0000000..15338f3 Binary files /dev/null and b/dependencies/LINUX/libgcc_s.so.1 differ diff --git a/dependencies/LINUX/libm.so.6 b/dependencies/LINUX/libm.so.6 new file mode 100644 index 0000000..033c742 Binary files /dev/null and b/dependencies/LINUX/libm.so.6 differ diff --git a/dependencies/LINUX/libssl.so.3 b/dependencies/LINUX/libssl.so.3 new file mode 100644 index 0000000..d6435a4 Binary files /dev/null and b/dependencies/LINUX/libssl.so.3 differ diff --git a/dependencies/LINUX/libstdc++.so.6 b/dependencies/LINUX/libstdc++.so.6 new file mode 100644 index 0000000..ad1dc2e Binary files /dev/null and b/dependencies/LINUX/libstdc++.so.6 differ diff --git a/dependencies/LINUX/libz.so.1 b/dependencies/LINUX/libz.so.1 new file mode 100644 index 0000000..ac28a92 Binary files /dev/null and b/dependencies/LINUX/libz.so.1 differ diff --git a/dependencies/LINUX/libzstd.so.1 b/dependencies/LINUX/libzstd.so.1 new file mode 100644 index 0000000..177ede2 Binary files /dev/null and b/dependencies/LINUX/libzstd.so.1 differ diff --git a/readme.md b/readme.md index 8c75e2a..6c1130c 100644 --- a/readme.md +++ b/readme.md @@ -16,10 +16,10 @@ https://github.com/user-attachments/assets/f5459aea-77a1-4f9f-b271-19e53968b914 --- -# ✨ Что нового в Beta (v1.4) +# ✨ Что нового в Beta (v1.5) -* **Решена проблема с удалением системных путей** -* **Решена проблема с различиями в данных. Где то функция принимает json, где то string (в коде)** +* Исправлена критическая ошибка при работе с аргументами +* Скорректирована логика главного файла Актуальный список задач и статус их выполнения можно посмотреть в [`TODO.MD`](https://todo.md/). diff --git a/scripts/LinuxTarGZCreate.sh b/scripts/LinuxTarGZCreate.sh new file mode 100644 index 0000000..31c2bf6 --- /dev/null +++ b/scripts/LinuxTarGZCreate.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +mkdir Output +cmake -B build -G "Unix Makefiles" +cmake --build build + +cd dependencies/LINUX + +tar -czvf ../../Output/LinuxArchive.tar.gz \ + -C . . \ + -C ../../build CacheCleaner + + +cd .. \ No newline at end of file diff --git a/scripts/WinSetupCreate.cmd b/scripts/WinSetupCreate.cmd new file mode 100644 index 0000000..37d2ed8 --- /dev/null +++ b/scripts/WinSetupCreate.cmd @@ -0,0 +1,7 @@ +@echo off + +cmake -B build -G "MinGW Makefiles" +cmake --build build +"C:\Program Files\Inno Setup 6\Compil32.exe" /cc "setup.iss" + +pause \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 2fc8780..abf9696 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -105,12 +105,11 @@ int main(int argc, char* argv[]) { } else if (!FAST_FLAG && !DRY_RUN_ONLY_FLAG && PresetFile_Content.first) { PresetFile_Content.second = interactiveLogic::DANGER_EditPresetContentAsk(PresetFile_Content.second); + } - for (auto el : JSONworker::get_PresetPaths(PresetFile_Content.second)) { + for (auto el : JSONworker::get_PresetPaths(PresetFile_Content.second)) { categories_keys.insert(el.first); all_categories[el.first].push_back(el.second); - } - } //Шаг [2/4] Уточнение пользовательских путей и сохранение @@ -125,7 +124,7 @@ int main(int argc, char* argv[]) { for (auto el : NoInternetPaths::Linux_Extern) ExternList.push_back(el); #endif } - else { + else if (!FAST_FLAG && !DRY_RUN_ONLY_FLAG && ExternList_Content.first) { ExternList = JSONworker::get_ExternListPaths(ExternList_Content.second); } diff --git a/version.txt b/version.txt index 840ca8c..400122e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.4 \ No newline at end of file +1.5 \ No newline at end of file