From 8b894725f56f2ee74ffa309f10e5858154dbe036 Mon Sep 17 00:00:00 2001 From: 7heo <7heo@users.noreply.github.com> Date: Fri, 27 Mar 2026 19:44:01 +0100 Subject: [PATCH 1/3] Fix Makefile so it doesn't depend on Bash --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ca9d0ced..b8692fb8 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ RM = rm MKDIR = mkdir MESON = meson DBG = gdb +OS ?= $(shell uname -s) BUILDDIR = builddir PREFIX = $(PWD)/prefix @@ -51,14 +52,14 @@ doc: xdg-open $(PREFIX)/share/doc/srain/html/index.html $(BUILDDIR): meson.build | $(PREFIX) - if [[ "$$OSTYPE" == "darwin"* ]]; then \ - source ./script/macos-pkgconfig-path.sh; \ - fi; \ - if [[ "$$OSTYPE" == "linux-gnu"* ]]; then \ - $(MESON) setup --prefix=$(PREFIX) --buildtype=debug $@; \ - else \ - $(MESON) setup --prefix=$(PREFIX) --buildtype=debug -Dapp_indicator=false $@; \ - fi +ifeq ($(OS), Darwin) + . ./script/macos-pkgconfig-path.sh +else ifeq ($(OS), Linux) + $(MESON) setup --prefix=$(PREFIX) --buildtype=debug $@ +else + $(MESON) setup --prefix=$(PREFIX) --buildtype=debug -Dapp_indicator=false $@; \ +endif +endif $(PREFIX): $(MKDIR) $@ From 7f04edee3cedc86013dd4c284dd6112fa9c3b851 Mon Sep 17 00:00:00 2001 From: 7heo <7heo@users.noreply.github.com> Date: Fri, 27 Mar 2026 19:44:54 +0100 Subject: [PATCH 2/3] Also allow "Enter" to send messages --- src/sui/sui_window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sui/sui_window.c b/src/sui/sui_window.c index 58512ac4..62e60945 100644 --- a/src/sui/sui_window.c +++ b/src/sui/sui_window.c @@ -735,6 +735,7 @@ static gboolean input_text_view_on_key_press(GtkTextView *text_view, break; } case GDK_KEY_Return: + case GDK_KEY_KP_Enter: { if ((self->cfg->send_on_ctrl_enter) ^ (event->state & GDK_CONTROL_MASK )){ From 40a57c78f9b48a314c3d54358e959d957a2327eb Mon Sep 17 00:00:00 2001 From: 7heo <7heo@users.noreply.github.com> Date: Fri, 27 Mar 2026 19:45:58 +0100 Subject: [PATCH 3/3] Fix various shell scripts --- script/gen-build-id.sh | 6 +++--- script/macos-pkgconfig-path.sh | 7 ++++--- script/rename-g-type.sh | 20 ++++++++++---------- script/srv | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/script/gen-build-id.sh b/script/gen-build-id.sh index b7c47b0a..29108d06 100755 --- a/script/gen-build-id.sh +++ b/script/gen-build-id.sh @@ -4,10 +4,10 @@ # # Check argument -[ -z $1 ] && echo Missing target directory && exit 1 +[ -z "$1" ] && echo Missing target directory && exit 1 # Whether a git repo -cd $1 && [ -d .git ] && git rev-parse --git-dir > /dev/null 2>&1 || exit 0 +cd "$1" && [ -d .git ] && git rev-parse --git-dir > /dev/null 2>&1 || exit 0 # Generate build ID -echo -n git@0.`git rev-list --count HEAD`.`git describe --always` +printf '%s' "git@0.$(git rev-list --count HEAD).$(git describe --always)" diff --git a/script/macos-pkgconfig-path.sh b/script/macos-pkgconfig-path.sh index db240a64..d4b9bc3a 100755 --- a/script/macos-pkgconfig-path.sh +++ b/script/macos-pkgconfig-path.sh @@ -1,3 +1,4 @@ -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/usr/local/opt/icu4c/lib/pkgconfig" -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/usr/local/opt/openssl@3/lib/pkgconfig" -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/usr/local/opt/libsoup@2/lib/pkgconfig" +#!/bin/sh +export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" +export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@3/lib/pkgconfig" +export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libsoup@2/lib/pkgconfig" diff --git a/script/rename-g-type.sh b/script/rename-g-type.sh index 084ca83f..ef17c200 100755 --- a/script/rename-g-type.sh +++ b/script/rename-g-type.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Type: GtkWidget # Variations: @@ -28,13 +28,13 @@ old_var=($(gen_var ${OLD_TYPE})) new_var=($(gen_var ${NEW_TYPE})) for f in $(find ./src/ \( -name '*.h' -o -name '*.c' \)); do - sed -i "s/\b${old_var[0]}\b/${new_var[0]}/g" ${f} # GtkWidget - sed -i "s/\b${old_var[0]}Class\b/${new_var[0]}Class/g" ${f} # GtkWidgetClass - sed -i "s/\b_${old_var[0]}\b/_${new_var[0]}/g" ${f} # _GtkWidget - sed -i "s/\b_${old_var[0]}Class\b/_${new_var[0]}Class/g" ${f} # _GtkWidgetClass - sed -i "s/\b${old_var[1]}\b/${new_var[1]}/g" ${f} # GTK_TYPE_WIDGET - sed -i "s/\b${old_var[2]}\([0-9a-zA-Z_]*\b\)/${new_var[2]}\1/g" ${f} # GTK_WIDGET[xxx] - sed -i "s/\b${old_var[3]}\b/${new_var[3]}/g" ${f} # gtk_widget - sed -i "s/\b${old_var[3]}\([0-9a-zA-Z_ ]*(\)/${new_var[3]}\1/g" ${f} # gtk_widget[xxx]( - sed -i "s/\b${old_var[4]}\b/${new_var[4]}/g" ${f} # GTK_IS_WIDGET + sed -i "s/\b${old_var[0]}\b/${new_var[0]}/g" "${f}" # GtkWidget + sed -i "s/\b${old_var[0]}Class\b/${new_var[0]}Class/g" "${f}" # GtkWidgetClass + sed -i "s/\b_${old_var[0]}\b/_${new_var[0]}/g" "${f}" # _GtkWidget + sed -i "s/\b_${old_var[0]}Class\b/_${new_var[0]}Class/g" "${f}" # _GtkWidgetClass + sed -i "s/\b${old_var[1]}\b/${new_var[1]}/g" "${f}" # GTK_TYPE_WIDGET + sed -i "s/\b${old_var[2]}\([0-9a-zA-Z_]*\b\)/${new_var[2]}\1/g" "${f}" # GTK_WIDGET[xxx] + sed -i "s/\b${old_var[3]}\b/${new_var[3]}/g" "${f}" # gtk_widget + sed -i "s/\b${old_var[3]}\([0-9a-zA-Z_ ]*(\)/${new_var[3]}\1/g" "${f}" # gtk_widget[xxx]( + sed -i "s/\b${old_var[4]}\b/${new_var[4]}/g" "${f}" # GTK_IS_WIDGET done diff --git a/script/srv b/script/srv index 78843565..71bb4c58 100755 --- a/script/srv +++ b/script/srv @@ -1,3 +1,3 @@ -#!/usr/bin/env sh +#!/bin/sh -ngircd -n -p -f ngircd.conf +ngircd -n -p -f ngircd.conf