From 1f9a78956b9c78218e63e024e7709894da8f4b33 Mon Sep 17 00:00:00 2001 From: Nicole O'Connor Date: Sat, 18 Jan 2025 23:09:28 -0800 Subject: [PATCH] version bump, update for modern boost, default cellar bottle path baked in --- cogrc | 3 ++- src/bottles/activate.cpp | 9 ++++----- src/bottles/bottles.cpp | 3 +-- src/core/fs.cpp | 3 +-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cogrc b/cogrc index bb156c8..a4e1b3d 100644 --- a/cogrc +++ b/cogrc @@ -1,5 +1,6 @@ [version] -release_version=0.4 +release_version=0.5 [defaults] wine-path=wine +cellar-bottle-path=~/.local/share/cellar/bottles \ No newline at end of file diff --git a/src/bottles/activate.cpp b/src/bottles/activate.cpp index 192d7d5..ccfbe31 100644 --- a/src/bottles/activate.cpp +++ b/src/bottles/activate.cpp @@ -3,8 +3,7 @@ #include #include -#include -#include +#include #include "bottles.hpp" #include "cellar.hpp" @@ -20,9 +19,9 @@ void cellar::bottles::switch_active_bottle(int argc, vector argv) { return; } - string homepath = getenv("HOME"); // /home/nick - string bottlepath = homepath + "/.wine"; // /home/nick/.wine - string targetpath = homepath + "/.local/share/cellar/bottles/" + argv[1]; // /home/nick/.wine.example + string homepath = getenv("HOME"); + string bottlepath = homepath + "/.wine"; + string targetpath = homepath + "/.local/share/cellar/bottles/" + argv[1]; file_status targetstatus = symlink_status(targetpath); if (!exists(targetstatus)) { diff --git a/src/bottles/bottles.cpp b/src/bottles/bottles.cpp index 2354b32..f604191 100644 --- a/src/bottles/bottles.cpp +++ b/src/bottles/bottles.cpp @@ -5,8 +5,7 @@ #include #include -#include -#include +#include #include "nlohmann/json.hpp" #include "bottles.hpp" diff --git a/src/core/fs.cpp b/src/core/fs.cpp index c98437f..d0d612c 100644 --- a/src/core/fs.cpp +++ b/src/core/fs.cpp @@ -2,8 +2,7 @@ #include #include -#include -#include +#include #include "cellar.hpp" #include "fs.hpp"