From 206e43ae0799e149daf50070dc1b673746dae2aa Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Thu, 25 Jan 2024 09:39:12 +0000 Subject: [PATCH] Update template-desktop.sh Take account that the menu is now in a file menu-classic.ui --- scripts/template-desktop.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/template-desktop.sh b/scripts/template-desktop.sh index 582ed775..60a22c96 100755 --- a/scripts/template-desktop.sh +++ b/scripts/template-desktop.sh @@ -9,7 +9,7 @@ tmp_file=$(mktemp "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX") path=$(dirname "$(realpath "$0")") -srcpath=$(dirname "$path")/src/layout-util.cc +srcpath=$(dirname "$path")/src/ui/menu-classic.ui templatepath=$(dirname "$path")/plugins/org.geeqie.template.desktop.in awk -v src_path="$srcpath" 'BEGIN { @@ -22,11 +22,11 @@ function get_menus() { {while ((getline line < src_path) > 0 ) { - if (line == "\"\"") + if (line == "") { menu_flag = 1 } - if (line == "\"<\057ui>\";") + if (line == "<\047ui>") { menu_flag = 0 } @@ -68,6 +68,10 @@ function get_menus() { i = i - 1 } + if (lineArr[2] == "PluginsMenu") + { + i = i - 1 + } } } } -- 2.20.1