From 3daa7163e96c1773dce99f6d159f8c2017657260 Mon Sep 17 00:00:00 2001
From: Senorsen <sen@senorsen.com>
Date: Sun, 8 Feb 2015 22:35:28 +0800
Subject: [PATCH] Fixed several bugs in rpm package

---
 build/debian/build.sh         | 18 +-----------------
 build/rpm/build_spec.sh       |  5 ++---
 lib/version                   |  2 +-
 miscellaneous/zjunet-postinst | 31 +++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100755 miscellaneous/zjunet-postinst

diff --git a/build/debian/build.sh b/build/debian/build.sh
index 32cd388..445b3cc 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -22,23 +22,7 @@ mkdir -p debian/DEBIAN
 cat  > debian/DEBIAN/postinst <<EOF
 #!/bin/sh
 
-cp /usr/share/zjunet/qsc.list /etc/apt/sources.list.d/qsc.list
-chmod 644 /etc/apt/sources.list.d/qsc.list
-apt-key add /usr/share/zjunet/qsc.public.key 2>&1 >/dev/null || true
-
-cat <<BANNER
-----------------------------------------------------------------------
-
-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 Version 3 for more details.
-
-You can ask questions, file a bug or make PRs here:
-* https://github.com/QSCTech/zjunet
-
-----------------------------------------------------------------------
-BANNER
+/usr/share/zjunet/zjunet-postinst
 
 EOF
 chmod 755 debian/DEBIAN/postinst
diff --git a/build/rpm/build_spec.sh b/build/rpm/build_spec.sh
index 6254668..e12c814 100755
--- a/build/rpm/build_spec.sh
+++ b/build/rpm/build_spec.sh
@@ -34,6 +34,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/usr/bin' >> zjunet.spec
 echo 'mkdir -p $RPM_BUILD_ROOT/usr/lib/zjunet' >> zjunet.spec
 echo 'mkdir -p $RPM_BUILD_ROOT/usr/share/zjunet' >> zjunet.spec
 echo 'install -m 755 zjunet $RPM_BUILD_ROOT/usr/bin/zjunet' >> zjunet.spec
+echo 'install -m 755 zjunet-postinst $RPM_BUILD_ROOT/usr/share/zjunet/zjunet-postinst' >> zjunet.spec
 cd lib
 for f in *.sh; do
 echo "install -m 755 lib/$f \$RPM_BUILD_ROOT/usr/lib/zjunet/$f" >> ../zjunet.spec
@@ -47,6 +48,7 @@ echo "%defattr(-,root,root)" >> zjunet.spec
 echo "/usr/bin/zjunet" >> zjunet.spec
 echo "/usr/share/zjunet/qsc.public.key" >> zjunet.spec
 echo "/usr/share/zjunet/qsc.repo" >> zjunet.spec
+echo "/usr/share/zjunet/zjunet-postinst" >> zjunet.spec
 cd lib
 for f in *.sh; do
 echo "/usr/lib/zjunet/$f" >> ../zjunet.spec
@@ -57,9 +59,6 @@ echo "%clean" >> zjunet.spec
 echo 'rm -rf $RPM_BUILD_ROOT' >> zjunet.spec
 echo "" >> zjunet.spec
 echo "%post" >> zjunet.spec
-echo "cp /usr/share/zjunet/qsc.public.key /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66 || true" >> zjunet.spec
-echo "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66 || true" >> zjunet.spec
-echo "cp /usr/share/zjunet/qsc.repo /etc/yum.repos.d/qsc.repo || true" >> zjunet.spec
 echo "/usr/share/zjunet/zjunet-postinst || true" >> zjunet.spec
 echo "" >> zjunet.spec
 echo "%changelog" >> zjunet.spec
diff --git a/lib/version b/lib/version
index 2b4b7be..aade696 100644
--- a/lib/version
+++ b/lib/version
@@ -1 +1 @@
-0.2.4-1
+0.2.4-2
diff --git a/miscellaneous/zjunet-postinst b/miscellaneous/zjunet-postinst
new file mode 100755
index 0000000..76f5bc1
--- /dev/null
+++ b/miscellaneous/zjunet-postinst
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+command -v apt-key 2>&1 >/dev/null && [ -d /etc/apt ] && {
+	cp /usr/share/zjunet/qsc.list /etc/apt/sources.list.d/qsc.list
+	chmod 644 /etc/apt/sources.list.d/qsc.list
+	apt-key add /usr/share/zjunet/qsc.public.key 2>&1 >/dev/null || true
+	echo "Added apt list."
+}
+
+command -v rpm 2>&1 >/dev/null && [ -d /etc/pki/rpm-gpg ] && [ -d /etc/yum.repos.d ] && {
+	cp /usr/share/zjunet/qsc.public.key /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
+	chmod 644 /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
+	rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
+	cp /usr/share/zjunet/qsc.repo /etc/yum.repos.d/qsc.repo || true
+	echo "Added yum repo."
+}
+
+cat <<BANNER
+----------------------------------------------------------------------
+
+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 Version 3 for more details.
+
+You can ask questions, file a bug or make PRs here:
+* https://github.com/QSCTech/zjunet
+
+----------------------------------------------------------------------
+BANNER
+