Merge pull request #2 from Ianisop/dev

v0.6.0 merge install.sh changes

Author: Ianisop

CMakeLists.txt

@@ -69,6 +69,14 @@ target_link_libraries(lsd
     clip
 )
 
+# ---- Define install path macro ----
+if(CMAKE_BUILD_TYPE MATCHES Release)
+    target_compile_definitions(lsd PRIVATE RELEASE_INSTALL_PATH=\"/usr/local/share/lsd/\")
+else()
+    target_compile_definitions(lsd PRIVATE DEBUG_INSTALL_PATH=\"./build/\")
+endif()
+
+
 # Add pthread on Linux
 if (UNIX AND NOT APPLE)
     target_link_libraries(lsd PRIVATE pthread)

build.sh

@@ -1,12 +1,18 @@
 #!/bin/bash
+cd build
+mkdir shaders
+mkdir fonts
 cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1
 make
-cp ../src/shaders/shader.vert .
-cp ../src/shaders/shader.frag .
-cp ../src/shaders/bg.frag .
-cp ../src/shaders/bg.vert .
 
-cp ../src/fonts/JetBrainsMono-Bold.ttf .
-cp ../src/fonts/JetBrainsMono-Italic.ttf .
-cp ../src/fonts/JetBrainsMono-BoldItalic.ttf .
-cp ../src/fonts/JetBrainsMono-Medium.ttf .
+cp ../src/shaders/shader.vert shaders/
+cp ../src/shaders/shader.frag shaders/
+cp ../src/shaders/bg.frag shaders/
+cp ../src/shaders/bg.vert shaders/
+
+cp ../src/fonts/JetBrainsMono-Bold.ttf fonts/
+cp ../src/fonts/JetBrainsMono-Italic.ttf fonts
+cp ../src/fonts/JetBrainsMono-BoldItalic.ttf fonts/
+cp ../src/fonts/JetBrainsMono-Medium.ttf fonts/
+
+./lsd

install.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+
+APP_NAME="lsd"
+BUILD_DIR="build"
+INSTALL_BIN="/usr/local/bin/$APP_NAME"
+INSTALL_SHARE="/usr/local/share/$APP_NAME"
+DESKTOP_FILE="/usr/share/applications/$APP_NAME.desktop"
+
+# Build
+mkdir -p "$BUILD_DIR"
+cd "$BUILD_DIR"
+cmake .. -DCMAKE_BUILD_TYPE=Release
+make
+cd ..
+
+# Install executable
+echo "Installing executable to $INSTALL_BIN"
+sudo cp "$BUILD_DIR/$APP_NAME" "$INSTALL_BIN"
+sudo chmod +x "$INSTALL_BIN"
+
+# Install resources
+echo "Installing resources to $INSTALL_SHARE"
+sudo mkdir -p "$INSTALL_SHARE"
+sudo mkdir -p "$INSTALL_SHARE/shaders"
+sudo mkdir -p "$INSTALL_SHARE/fonts"
+sudo cp src/shaders/*.vert "$INSTALL_SHARE/shaders/"
+sudo cp src/shaders/*.frag "$INSTALL_SHARE/shaders/"
+sudo cp src/fonts/*.ttf "$INSTALL_SHARE/fonts/"
+sudo cp src/lsd.png /usr/local/share/lsd/lsd.png
+
+# Create .desktop file
+echo "Creating .desktop file at $DESKTOP_FILE"
+sudo tee "$DESKTOP_FILE" > /dev/null <<EOF
+[Desktop Entry]
+Name=$APP_NAME
+Comment=Lightweight terminal app
+Exec=$INSTALL_BIN
+Icon=/usr/local/share/lsd/lsd.png
+Terminal=false
+Type=Application
+Categories=Utility;TerminalEmulator;
+EOF
+
+echo "Installation complete. You can run '$APP_NAME' from your application menu or terminal."

readme.md

@@ -1,3 +1,7 @@
+<p align="center">
+  <img src="src/lsd.png">
+</p>
+
 <h1 align="center">lsd</h1>
 <p align="center"><b>Lightweight Shader-Driven Terminal Emulator</b></p>
 

src/lsd.cpp

@@ -24,8 +24,17 @@
 #include <unistd.h>
 #include <vector>
 
+
+#ifdef RELEASE_INSTALL_PATH
+std::string asset_path = RELEASE_INSTALL_PATH;
+#else
+std::string asset_path = DEBUG_INSTALL_PATH;
+#endif
+
 namespace LSD
 {
+
+
 std::string WINDOW_TITLE = "lsd";
 int FONT_SIZE = 18;
 
@@ -206,7 +215,6 @@ void uploadAtlases()
     }
 }
 
-// test comment for merge commit :)
 
 // Grid helpers (call with g_lock held)
 void gridResizeLocked()
@@ -1190,7 +1198,7 @@ int main()
   LSD::current_pty->setReadCallback(LSD::read_callback);// TODO: find way to unsubscribe maybe
 
   // ── Terminal shader (required) ───────────────────────────────────────────
-  LSD::g_terminal_program = LSD::loadShaders("shader.vert", "shader.frag");
+  LSD::g_terminal_program = LSD::loadShaders(asset_path + "shaders/shader.vert", asset_path + "shaders/shader.frag");
   if (!LSD::g_terminal_program)
     {
       std::cerr << "Failed to load terminal shaders\n";
@@ -1199,7 +1207,7 @@ int main()
 
 
   // Background shader falls back to clear color
-  LSD::g_background_program = LSD::loadShaders("bg.vert", "bg.frag");
+  LSD::g_background_program = LSD::loadShaders(asset_path + "shaders/bg.vert", asset_path + "shaders/bg.frag");
   if (LSD::g_background_program)
     {
       LSD::g_background_time_loc = glGetUniformLocation(LSD::g_background_program, "uTime");
@@ -1255,14 +1263,16 @@ int main()
       std::cerr << "FT init failed\n";
       return -1;
     }
-  if (FT_New_Face(LSD::font_library, "JetBrainsMono-Medium.ttf", 0, &LSD::font_normal_face))
+  if (FT_New_Face(
+        LSD::font_library, (asset_path + "fonts/JetBrainsMono-Medium.ttf").c_str(), 0, &LSD::font_normal_face))
     {
       std::cerr << "Regular font missing\n";
       return -1;
     }
-  FT_New_Face(LSD::font_library, "JetBrainsMono-Bold.ttf", 0, &LSD::font_bold_face);
-  FT_New_Face(LSD::font_library, "JetBrainsMono-Italic.ttf", 0, &LSD::font_italic_face);
-  FT_New_Face(LSD::font_library, "JetBrainsMono-BoldItalic.ttf", 0, &LSD::font_bold_italic_face);
+  FT_New_Face(LSD::font_library, (asset_path + "fonts/JetBrainsMono-Bold.ttf").c_str(), 0, &LSD::font_bold_face);
+  FT_New_Face(LSD::font_library, (asset_path + "fonts/JetBrainsMono-Italic.ttf").c_str(), 0, &LSD::font_italic_face);
+  FT_New_Face(
+    LSD::font_library, (asset_path + "fonts/JetBrainsMono-BoldItalic.ttf").c_str(), 0, &LSD::font_bold_italic_face);
 
   auto setSize = [](FT_Face f) {
     if (f) FT_Set_Pixel_Sizes(f, 0, (FT_UInt)LSD::FONT_SIZE);