From 0dd73156045256513099db110c95f31e964b27b5 Mon Sep 17 00:00:00 2001
From: Jean-Marie RENOUARD <jmrenouard@gmail.com>
Date: Mon, 31 Aug 2015 18:10:54 +0200
Subject: [PATCH] bug fixes on RPM generation Adding .gitignore for RPM related
 files

---
 .gitignore                |  3 +++
 build/build_rpm.sh        | 11 +++++++----
 build/clean.sh            |  2 +-
 build/mysqltuner.spec.tpl |  6 +++---
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore
 mode change 100644 => 100755 build/build_rpm.sh
 mode change 100644 => 100755 build/clean.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7f46c04
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+build/mysqltuner-*
+build/mysqltuner.spec
+build/build.log
diff --git a/build/build_rpm.sh b/build/build_rpm.sh
old mode 100644
new mode 100755
index 785c02f..c05ecc1
--- a/build/build_rpm.sh
+++ b/build/build_rpm.sh
@@ -2,14 +2,17 @@
 
 BUILD_DIR=`dirname $(readlink -f $0)`
 
-VERSION=$(grep -i tunerversion $BUILD_DIR/../mysqltuner.pl | grep = | cut -d\" -f2)
+VERSION=$(grep -Ei 'my \$tunerversion' $BUILD_DIR/../mysqltuner.pl | grep = | cut -d\" -f2)
 cd $BUILD_DIR
+sh ./clean.sh 
+
 perl -pe "s/%VERSION%/$VERSION/g" mysqltuner.spec.tpl > mysqltuner.spec
 mkdir -p $BUILD_DIR/mysqltuner-$VERSION
 cp $BUILD_DIR/../mysqltuner.pl mysqltuner.spec $BUILD_DIR/../LICENSE $BUILD_DIR/../basic_passwords.txt $BUILD_DIR/mysqltuner-$VERSION
 pod2man $BUILD_DIR/../mysqltuner.pl | gzip > $BUILD_DIR/mysqltuner-$VERSION/mysqltuner.1.gz
 
 tar czf $BUILD_DIR/mysqltuner-${VERSION}.tgz mysqltuner-$VERSION
-rpmbuild -ta mysqltuner-${VERSION}.tgz 2>/dev/null| grep --color=never '\.rpm' | cut -d: -f2 > ./lrpm.txt
-mv $(cat ./lrpm.txt) $BUILD_DIR
-rm -rf mysqltuner-$VERSION ./lrpm.txt
+rpmbuild -ta mysqltuner-${VERSION}.tgz 2>&1 | tee -a ./build.log
+set -x
+grep --color=never -E '^Wrote:' $BUILD_DIR/build.log | cut -d: -f2 | xargs -I{} mv {} .
+#rm -rf mysqltuner-$VERSION ./build.log
diff --git a/build/clean.sh b/build/clean.sh
old mode 100644
new mode 100755
index 08106d3..4529219
--- a/build/clean.sh
+++ b/build/clean.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-rm -rf mysqltuner-* mysqltuner.spec
+rm -rf mysqltuner-* mysqltuner.spec *.log
diff --git a/build/mysqltuner.spec.tpl b/build/mysqltuner.spec.tpl
index a76adf8..75ab0f0 100644
--- a/build/mysqltuner.spec.tpl
+++ b/build/mysqltuner.spec.tpl
@@ -26,10 +26,10 @@ Montgomery's MySQL tuning primer script.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_datarootdir}
 install -d $RPM_BUILD_ROOT/%{_mandir}/man1
-install -p %{name}.pl $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install -p %{name}.pl $RPM_BUILD_ROOT%{_bindir}/%{name}
 install -d $RPM_BUILD_ROOT%{_datarootdir}/%{name}
 install -p LICENSE $RPM_BUILD_ROOT%{_datarootdir}/%{name}
 install -p basic_passwords.txt $RPM_BUILD_ROOT%{_datarootdir}/%{name}
@@ -41,7 +41,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc %{_datarootdir}/%{name}
-%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/*
 
 %changelog