From f4d5ff9ed908284fb8d7d61f066141c3a62343ce Mon Sep 17 00:00:00 2001
From: Bastiaan van der Plaat <bastiaan.v.d.plaat@gmail.com>
Date: Mon, 29 Jan 2024 19:18:19 +0100
Subject: [PATCH] Welcome: Move tips.txt to /usr/share/Welcome because it's
 system wide

---
 .../anon/Documents => usr/share/Welcome}/tips.txt      |  0
 Userland/Applications/Welcome/WelcomeWidget.cpp        | 10 ++++++----
 Userland/Applications/Welcome/main.cpp                 |  1 +
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename Base/{home/anon/Documents => usr/share/Welcome}/tips.txt (100%)

diff --git a/Base/home/anon/Documents/tips.txt b/Base/usr/share/Welcome/tips.txt
similarity index 100%
rename from Base/home/anon/Documents/tips.txt
rename to Base/usr/share/Welcome/tips.txt
diff --git a/Userland/Applications/Welcome/WelcomeWidget.cpp b/Userland/Applications/Welcome/WelcomeWidget.cpp
index 318d5c9951..0495807d58 100644
--- a/Userland/Applications/Welcome/WelcomeWidget.cpp
+++ b/Userland/Applications/Welcome/WelcomeWidget.cpp
@@ -19,6 +19,9 @@
 #include <LibGfx/Palette.h>
 
 namespace Welcome {
+
+static String tips_file_path = "/usr/share/Welcome/tips.txt"_string;
+
 ErrorOr<NonnullRefPtr<WelcomeWidget>> WelcomeWidget::create()
 {
     auto welcome_widget = TRY(WelcomeWidget::try_create());
@@ -79,8 +82,7 @@ ErrorOr<void> WelcomeWidget::create_widgets()
     };
 
     if (auto result = open_and_parse_tips_file(); result.is_error()) {
-        auto path = TRY(String::formatted("{}/tips.txt", Core::StandardPaths::documents_directory()));
-        auto error = TRY(String::formatted("Opening \"{}\" failed: {}", path, result.error()));
+        auto error = TRY(String::formatted("Opening \"{}\" failed: {}", tips_file_path, result.error()));
         m_tip_label->set_text(error);
         warnln(error);
     }
@@ -92,8 +94,7 @@ ErrorOr<void> WelcomeWidget::create_widgets()
 
 ErrorOr<void> WelcomeWidget::open_and_parse_tips_file()
 {
-    auto path = TRY(String::formatted("{}/tips.txt", Core::StandardPaths::documents_directory()));
-    auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read));
+    auto file = TRY(Core::File::open(tips_file_path, Core::File::OpenMode::Read));
     auto buffered_file = TRY(Core::InputBufferedFile::create(move(file)));
     Array<u8, PAGE_SIZE> buffer;
 
@@ -128,4 +129,5 @@ void WelcomeWidget::paint_event(GUI::PaintEvent& event)
     rect.set_x(rect.x() + static_cast<int>(ceilf(m_banner_font->bold_variant().width("Serenity"sv))));
     painter.draw_text(rect, "OS"sv, m_banner_font->bold_variant(), Gfx::TextAlignment::CenterLeft, palette().tray_text());
 }
+
 }
diff --git a/Userland/Applications/Welcome/main.cpp b/Userland/Applications/Welcome/main.cpp
index 6da0dd3038..8fc0915fd3 100644
--- a/Userland/Applications/Welcome/main.cpp
+++ b/Userland/Applications/Welcome/main.cpp
@@ -23,6 +23,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     TRY(Core::System::unveil("/tmp/session/%sid/portal/filesystemaccess", "rw"));
     TRY(Core::System::unveil("/res", "r"));
     TRY(Core::System::unveil("/home", "r"));
+    TRY(Core::System::unveil("/usr/share/Welcome", "r"));
     TRY(Core::System::unveil("/bin/Help", "x"));
     TRY(Core::System::unveil(nullptr, nullptr));
     auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-welcome"sv));