From 9bd1f28b8d3085240b84ae6bb784f773ab307553 Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Mon, 12 Feb 2018 09:41:54 -0500
Subject: [PATCH] Minor package changes

---
 build/basecoin/DEBIAN/postinst        |  8 ++------
 build/ethermint/DEBIAN/postinst       |  6 +-----
 build/gaia/DEBIAN/postinst            | 10 ++--------
 build/spectemplates/app-template.spec |  2 +-
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/build/basecoin/DEBIAN/postinst b/build/basecoin/DEBIAN/postinst
index 9a06d6e3f..9d30d77ea 100644
--- a/build/basecoin/DEBIAN/postinst
+++ b/build/basecoin/DEBIAN/postinst
@@ -20,12 +20,8 @@ set -e
 case "$1" in
     configure)
     chown basecoin.basecoin /etc/basecoin
-    sudo -Hu basecoin basecoin init --home /etc/basecoin 2B24DEE2364762300168DF19B6C18BCE2D399EA2
-    #The above command generates a genesis.json file that contains validators. This is wrong, the validator part should be empty. https://github.com/tendermint/basecoin/issues/124
-    sudo -Hu basecoin tendermint init --home /etc/basecoin/tendermint
-    #The above command might need some kind of additional option in the future. https://github.com/tendermint/tendermint/issues/542
-    chmod 755 /etc/basecoin/tendermint
-    chown basecoin.basecoin /etc/basecoin/tendermint
+    sudo -Hu basecoin basecoin node init --home /etc/basecoin 2B24DEE2364762300168DF19B6C18BCE2D399EA2
+    sudo -Hu basecoin tendermint init --home /etc/basecoin
     systemctl daemon-reload
     ;;
 
diff --git a/build/ethermint/DEBIAN/postinst b/build/ethermint/DEBIAN/postinst
index 90739f818..d2f968358 100644
--- a/build/ethermint/DEBIAN/postinst
+++ b/build/ethermint/DEBIAN/postinst
@@ -25,11 +25,7 @@ case "$1" in
     chown ethermint.ethermint /etc/ethermint/keystore/UTC--2016-10-21T22-30-03.071787745Z--7eff122b94897ea5b0e2a9abf47b86337fafebdc
 
     sudo -Hu ethermint /usr/bin/ethermint --datadir /etc/ethermint init /etc/ethermint/genesis.json
-    sudo -Hu ethermint tendermint init --home /etc/ethermint/tendermint
-
-    chown ethermint.ethermint /etc/ethermint/tendermint
-    chmod 755 /etc/ethermint/tendermint
-
+    sudo -Hu ethermint tendermint init --home /etc/ethermint
     systemctl daemon-reload
     ;;
 
diff --git a/build/gaia/DEBIAN/postinst b/build/gaia/DEBIAN/postinst
index e1b606cb8..9bca36119 100644
--- a/build/gaia/DEBIAN/postinst
+++ b/build/gaia/DEBIAN/postinst
@@ -20,14 +20,8 @@ set -e
 case "$1" in
     configure)
     chown gaia.gaia /etc/gaia
-    sudo -Hu gaia gaia init --home /etc/gaia 2B24DEE2364762300168DF19B6C18BCE2D399EA2
-    #The above command generates a genesis.json file that contains validators. This is wrong, the validator part should be empty. https://github.com/tendermint/basecoin/issues/124
-    sudo -Hu gaia tendermint init --home /etc/gaia/tendermint
-    #The above command might need some kind of additional option in the future. https://github.com/tendermint/tendermint/issues/542
-
-    chmod 755 /etc/gaia/tendermint
-    chown gaia.gaia /etc/gaia/tendermint
-
+    sudo -Hu gaia gaia node init --home /etc/gaia 2B24DEE2364762300168DF19B6C18BCE2D399EA2
+    sudo -Hu gaia tendermint init --home /etc/gaia
     systemctl daemon-reload
     ;;
 
diff --git a/build/spectemplates/app-template.spec b/build/spectemplates/app-template.spec
index ad937d029..a622d1b4c 100644
--- a/build/spectemplates/app-template.spec
+++ b/build/spectemplates/app-template.spec
@@ -36,7 +36,7 @@ cd %{name}-%{version}-%{release}
 
 %post
 sudo -Hu %{name} tendermint init --home %{_sysconfdir}/%{name}
-sudo -Hu %{name} %{name} init --home %{_sysconfdir}/%{name} 2B24DEE2364762300168DF19B6C18BCE2D399EA2
+sudo -Hu %{name} %{name} node init --home %{_sysconfdir}/%{name} 2B24DEE2364762300168DF19B6C18BCE2D399EA2
 
 #Temporary until https://github.com/tendermint/basecoin/issues/123
 rm -f %{_sysconfdir}/%{name}/key.json