From 7884326b2f2416b4dfc775db8d0df803eea8c355 Mon Sep 17 00:00:00 2001
From: Alexander Schwinn <alexxcons@xfce.org>
Date: Mon, 3 Jun 2019 23:44:55 +0200
Subject: [PATCH] Remove superfluous shell script "ThunarBulkRename" (Bug
 #15373)

---
 .gitignore                       |  1 -
 Makefile.am                      | 15 ---------------
 Thunar-bulk-rename.desktop.in.in |  2 +-
 ThunarBulkRename.in              | 25 -------------------------
 4 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 ThunarBulkRename.in

diff --git a/.gitignore b/.gitignore
index 448ddcad..6d95f16e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ core
 org.xfce.thunar.appdata.xml
 thunar.appdata.xml
 gtk-doc.make
-ThunarBulkRename
 Thunar.spec
 docs/.*.swp
 docs/*.1
diff --git a/Makefile.am b/Makefile.am
index 9d12dbff..4744c0ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,19 +46,6 @@ ChangeLog: Makefile
 
 dist-hook: ChangeLog
 
-thunar_scriptsdir = $(HELPER_PATH_PREFIX)/Thunar
-thunar_scripts_SCRIPTS =						\
-	ThunarBulkRename
-
-ThunarBulkRename: ThunarBulkRename.in Makefile
-	$(AM_V_GEN) (							\
-		rm -f ThunarBulkRename.gen ThunarBulkRename		\
-		&& $(SED) -e "s,\@bindir\@,$(bindir),g" 			\
-			< $(srcdir)/ThunarBulkRename.in			\
-			> ThunarBulkRename.gen				\
-		&& mv ThunarBulkRename.gen ThunarBulkRename 		\
-	)
-
 desktopdir = $(datadir)/applications
 desktop_in_in_files = 							\
 	Thunar.desktop.in.in						\
@@ -102,7 +89,6 @@ polkit_policy_DATA = $(polkit_in_files:.policy.in=.policy)
 EXTRA_DIST =								\
 	FAQ								\
 	HACKING								\
-	ThunarBulkRename.in						\
 	intltool-extract.in						\
 	intltool-merge.in						\
 	intltool-update.in						\
@@ -116,7 +102,6 @@ EXTRA_DIST =								\
 CLEANFILES		= $(appdata_DATA)
 
 DISTCLEANFILES =							\
-	ThunarBulkRename						\
 	intltool-extract						\
 	intltool-merge							\
 	intltool-update							\
diff --git a/Thunar-bulk-rename.desktop.in.in b/Thunar-bulk-rename.desktop.in.in
index 59b71a27..129c752c 100644
--- a/Thunar-bulk-rename.desktop.in.in
+++ b/Thunar-bulk-rename.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Bulk Rename
 _Comment=Rename Multiple Files
 _GenericName=Bulk Rename
-Exec=@HELPERDIR@/Thunar/ThunarBulkRename %F
+Exec=thunar --bulk-rename %F
 Icon=Thunar
 Terminal=false
 StartupNotify=true
diff --git a/ThunarBulkRename.in b/ThunarBulkRename.in
deleted file mode 100644
index 4b12403a..00000000
--- a/ThunarBulkRename.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-# This is an ugly hack, required because xfdesktop simply
-# strips off all parameters from the Exec field, and so
-# we cannot just invoke Thunar --bulk-rename %F there
-exec @bindir@/Thunar --bulk-rename "$@"
-
-# vim:set ts=2 sw=2 et ai:
-- 
2.11.0