From 4dc778193952986c33a91a1a1465b68dbdef8ea1 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Mon, 13 Jan 2025 15:50:57 +0100 Subject: [PATCH] Update version and default paths --- src/include/options.h | 4 ++-- src/main.cpp | 2 +- src/osdep/amiberry.cpp | 52 +++++++++++++++++++++--------------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/include/options.h b/src/include/options.h index 9cf50c6eb..03d8ed3c2 100644 --- a/src/include/options.h +++ b/src/include/options.h @@ -19,8 +19,8 @@ #include "guisan/color.hpp" #define UAEMAJOR 5 -#define UAEMINOR 7 -#define UAESUBREV 4 +#define UAEMINOR 8 +#define UAESUBREV 0 #define MAX_AMIGADISPLAYS 1 diff --git a/src/main.cpp b/src/main.cpp index 8a115542b..351d6aec2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,7 +76,7 @@ #include "fsdb_host.h" #include "keyboard.h" -static const char __ver[40] = "$VER: Amiberry-Lite 5.7.4 (2024-09-01)"; +static const char __ver[40] = "$VER: Amiberry-Lite 5.8.0 (2025-01-13)"; long int version = 256 * 65536L * UAEMAJOR + 65536L * UAEMINOR + UAESUBREV; extern int console_logging; diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp index 21467dd29..ab0e4a9a9 100644 --- a/src/osdep/amiberry.cpp +++ b/src/osdep/amiberry.cpp @@ -3851,13 +3851,13 @@ std::string get_home_directory(const bool portable_mode) // 2: Check $HOME/Amiberry if (user_home_dir != nullptr) { - if (!directory_exists(user_home_dir, "/Amiberry")) + if (!directory_exists(user_home_dir, "/Amiberry-Lite")) { // If $HOME exists, but not the Amiberry subdirectory, create it - my_mkdir((std::string(user_home_dir) + "/Amiberry").c_str()); + my_mkdir((std::string(user_home_dir) + "/Amiberry-Lite").c_str()); } // $HOME/Amiberry exists, use it - write_log("Using home directory from $HOME/Amiberry\n"); + write_log("Using home directory from $HOME/Amiberry-Lite\n"); auto result = std::string(user_home_dir); return result.append("/Amiberry"); } @@ -3874,16 +3874,16 @@ std::string get_config_directory(bool portable_mode) { #ifdef __MACH__ const auto user_home_dir = getenv("HOME"); - if (!directory_exists(user_home_dir, "/Amiberry")) + if (!directory_exists(user_home_dir, "/Amiberry-Lite")) { - my_mkdir((std::string(user_home_dir) + "/Amiberry").c_str()); + my_mkdir((std::string(user_home_dir) + "/Amiberry-Lite").c_str()); } - if (!directory_exists(user_home_dir, "/Amiberry/Configurations")) + if (!directory_exists(user_home_dir, "/Amiberry-Lite/Configurations")) { - my_mkdir((std::string(user_home_dir) + "/Amiberry/Configurations").c_str()); + my_mkdir((std::string(user_home_dir) + "/Amiberry-Lite/Configurations").c_str()); } auto result = std::string(user_home_dir); - return result.append("/Amiberry/Configurations"); + return result.append("/Amiberry-Lite/Configurations"); #else if (portable_mode) { @@ -3906,17 +3906,17 @@ std::string get_config_directory(bool portable_mode) // 2: Check $HOME/Amiberry/conf if (user_home_dir != nullptr) { - if (!directory_exists(user_home_dir, "/Amiberry")) + if (!directory_exists(user_home_dir, "/Amiberry-Lite")) { - my_mkdir((std::string(user_home_dir) + "/Amiberry").c_str()); + my_mkdir((std::string(user_home_dir) + "/Amiberry-Lite").c_str()); } // $HOME/Amiberry exists, use it - if (!directory_exists(user_home_dir, "/Amiberry/conf")) + if (!directory_exists(user_home_dir, "/Amiberry-Lite/conf")) { - my_mkdir((std::string(user_home_dir) + "/Amiberry/conf").c_str()); + my_mkdir((std::string(user_home_dir) + "/Amiberry-Lite/conf").c_str()); } // This should be the most used scenario - write_log("Using config directory from $HOME/Amiberry/conf\n"); + write_log("Using config directory from $HOME/Amiberry-Lite/conf\n"); auto result = std::string(user_home_dir); return result.append("/Amiberry/conf"); } @@ -4039,9 +4039,9 @@ void create_missing_amiberry_folders() const std::string command = "cp -r " + default_controller_path + "* " + controllers_path; system(command.c_str()); } - else if (my_existsdir("/usr/share/amiberry/controllers/")) + else if (my_existsdir("/usr/share/amiberry-lite/controllers/")) { - const std::string command = "cp -r /usr/share/amiberry/controllers/* " + controllers_path; + const std::string command = "cp -r /usr/share/amiberry-lite/controllers/* " + controllers_path; system(command.c_str()); } } @@ -4059,9 +4059,9 @@ void create_missing_amiberry_folders() const std::string command = "cp -r " + default_whdboot_path + "* " + whdboot_path; system(command.c_str()); } - else if (my_existsdir("/usr/share/amiberry/whdboot/")) + else if (my_existsdir("/usr/share/amiberry-lite/whdboot/")) { - const std::string command = "cp -r /usr/share/amiberry/whdboot/* " + whdboot_path; + const std::string command = "cp -r /usr/share/amiberry-lite/whdboot/* " + whdboot_path; system(command.c_str()); } } @@ -4087,9 +4087,9 @@ void create_missing_amiberry_folders() const std::string command = "cp -r " + default_roms_path + "* " + rom_path; system(command.c_str()); } - else if (my_existsdir("/usr/share/amiberry/roms/")) + else if (my_existsdir("/usr/share/amiberry-lite/roms/")) { - const std::string command = "cp -r /usr/share/amiberry/roms/* " + rom_path; + const std::string command = "cp -r /usr/share/amiberry-lite/roms/* " + rom_path; system(command.c_str()); } } @@ -4122,9 +4122,9 @@ void create_missing_amiberry_folders() static void init_amiberry_dirs(const bool portable_mode) { #ifdef __MACH__ - const std::string amiberry_dir = "Amiberry"; + const std::string amiberry_dir = "Amiberry-Lite"; #else - const std::string amiberry_dir = "amiberry"; + const std::string amiberry_dir = "amiberry-lite"; #endif current_dir = home_dir = get_home_directory(portable_mode); data_dir = get_data_directory(portable_mode); @@ -4137,8 +4137,8 @@ static void init_amiberry_dirs(const bool portable_mode) if (portable_mode) #endif { - amiberry_conf_file = config_path + "/amiberry.conf"; - amiberry_ini_file = config_path + "/amiberry.ini"; + amiberry_conf_file = config_path + "/amiberry-lite.conf"; + amiberry_ini_file = config_path + "/amiberry-lite.ini"; themes_path = config_path; // These paths are relative to the XDG_DATA_HOME directory @@ -4177,8 +4177,8 @@ static void init_amiberry_dirs(const bool portable_mode) my_mkdir(xdg_config_home.c_str()); // The amiberry.conf file is always in the XDG_CONFIG_HOME/amiberry directory - amiberry_conf_file = xdg_config_home + "/amiberry.conf"; - amiberry_ini_file = xdg_config_home + "/amiberry.ini"; + amiberry_conf_file = xdg_config_home + "/amiberry-lite.conf"; + amiberry_ini_file = xdg_config_home + "/amiberry-lite.ini"; themes_path = xdg_config_home; // These paths are relative to the XDG_DATA_HOME directory @@ -4217,7 +4217,7 @@ static void init_amiberry_dirs(const bool portable_mode) floppy_path.append("/floppies/"); harddrive_path.append("/harddrives/"); cdrom_path.append("/cdroms/"); - logfile_path.append("/amiberry.log"); + logfile_path.append("/amiberry-lite.log"); rom_path.append("/roms/"); rp9_path.append("/rp9/"); saveimage_dir.append("/");