[packages/kernel-tools] rename perf to .sh ext and +x

glen glen at pld-linux.org
Wed Feb 26 11:24:28 CET 2014


commit d312b55af4362960cff65481a76222f83484d60c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Feb 26 12:24:10 2014 +0200

    rename perf to .sh ext and +x

 kernel-tools.spec | 4 ++--
 perf => perf.sh   | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index c952a8b..8f70261 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -28,7 +28,7 @@ Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
 %endif
 Source1:	cpupower.service
 Source2:	cpupower.config
-Source3:	perf
+Source3:	perf.sh
 URL:		http://www.kernel.org/
 BuildRequires:	gettext-tools
 BuildRequires:	pciutils-devel
@@ -377,7 +377,7 @@ PWD=${PWD:-$(pwd)}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/perf-core/tests
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/perf
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/perf
 %endif
 
 # gen_init_cpio
diff --git a/perf b/perf.sh
old mode 100644
new mode 100755
similarity index 57%
rename from perf
rename to perf.sh
index af12741..5c9c61e
--- a/perf
+++ b/perf.sh
@@ -1,19 +1,18 @@
 #!/bin/sh
 
-if [ -x /usr/bin/perf_gtk -a -n "$DISPLAY" ] ; then
+if [ -x /usr/bin/perf_gtk -a -n "$DISPLAY" ]; then
 	# prefer GTK version under X11
 	exec /usr/bin/perf_gtk "$@"
 fi
-if [ -x /usr/bin/perf_slang ] ; then
+if [ -x /usr/bin/perf_slang ]; then
 	# use text version if perf_gtk or $DISPLAY is not available
 	exec /usr/bin/perf_slang "$@"
 fi
-if [ -x /usr/bin/perf_gtk ] ; then
+if [ -x /usr/bin/perf_gtk ]; then
 	# fall-back to perf_gtk if no perf_slang (it can work in a terminal
 	# too)
 	exec /usr/bin/perf_gtk "$@"
 fi
 
-echo "You need 'kernel-tools-perf-gtk' or 'kernel-tools-perf-slang' package installed!"
-
+echo >&2 "You need 'kernel-tools-perf-gtk' or 'kernel-tools-perf-slang' package installed!"
 exit 1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/d312b55af4362960cff65481a76222f83484d60c



More information about the pld-cvs-commit mailing list