From 3350394c22e3373693094f107aafb2e503dcd0a2 Mon Sep 17 00:00:00 2001 From: Richard Barber Date: Mon, 17 Feb 2020 14:14:57 -0800 Subject: [PATCH] mac:lowercase bundle UUID --- rtgui/options.cc | 1 - tools/osx/macosx_bundle.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rtgui/options.cc b/rtgui/options.cc index 414eec521..d85317c9d 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -2279,7 +2279,6 @@ void Options::load(bool lightweight) std::string homeconfig{homebuf}; std::strcat(&homeconfig[0], "/Application Support/RawTherapee/config"); path = homeconfig.c_str(); - delete(homedir); #else path = g_getenv("RT_SETTINGS"); #endif diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh index f08e45c48..be76face3 100644 --- a/tools/osx/macosx_bundle.sh +++ b/tools/osx/macosx_bundle.sh @@ -131,7 +131,7 @@ echo "Bundle system: $(sysctl -n machdep.cpu.brand_string)" >> "${CMAKE_BUILD_TY echo "Bundle OS: $(sw_vers -productName) $(sw_vers -productVersion) $(sw_vers -buildVersion) $(uname -mrs)" >> "${CMAKE_BUILD_TYPE}"/Resources/AboutThisBuild.txt echo "Bundle date: $(date -Ru) ZULU" >> "${CMAKE_BUILD_TYPE}"/Resources/AboutThisBuild.txt echo "Bundle epoch: $(date +%s)" >> "${CMAKE_BUILD_TYPE}"/Resources/AboutThisBuild.txt -echo "Bundle UUID: $(uuidgen)" >> "${CMAKE_BUILD_TYPE}"/Resources/AboutThisBuild.txt +echo "Bundle UUID: $(uuidgen|tr 'A-Z' 'a-z')" >> "${CMAKE_BUILD_TYPE}"/Resources/AboutThisBuild.txt msg "Copying release files:" ditto "${CMAKE_BUILD_TYPE}/MacOS" "${MACOS}"