improve packaging

cockroach/cockroach-sql.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+exec @l_prefix@/bin/cockroach sql \
+    --ca-cert=@l_prefix@/etc/cockroach/ca.crt \
+    --cert=@l_prefix@/etc/cockroach/client.crt \
+    --key=@l_prefix@/etc/cockroach/client.key \
+    ${1+"$@"}
+

cockroach/cockroach.spec

@@ -41,6 +41,7 @@ Release:      20160515
 #   list of sources
 Source0:      http://download.openpkg.org/components/versioned/cockroach/cockroach-%{V_cockroach_snap}.tar.xz
 Source1:      rc.cockroach
+Source2:      cockroach-sql.sh
 Patch0:       cockroach.patch
 
 #   build information
@@ -83,10 +84,17 @@ PreReq:       OpenPKG, openpkg >= 20140101
     cd src/github.com/cockroachdb/cockroach
     go build -x -ldflags "-extldflags '-Wl,-zmuldefs'" -o cockroach
 
+    #   build manual pages
+    ./cockroach gen man
+
+    #   build bash autocomplete script
+    ./cockroach gen autocomplete
+
 %install
     #   create directory hierarchy
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/sbin \
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/etc/cockroach \
         $RPM_BUILD_ROOT%{l_prefix}/var/cockroach/log \
@@ -96,7 +104,22 @@ PreReq:       OpenPKG, openpkg >= 20140101
     #   install program
     %{l_shtool} install -c -s -m 755 \
         src/github.com/cockroachdb/cockroach/cockroach \
-        $RPM_BUILD_ROOT%{l_prefix}/sbin/cockroach
+        $RPM_BUILD_ROOT%{l_prefix}/bin/cockroach
+
+    #   install wrapper script
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+        %{SOURCE cockroach-sql.sh} \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/cockroach-sql
+
+    #   install manual pages
+    %{l_shtool} install -c -m 644 \
+        src/github.com/cockroachdb/cockroach/man/man1/*.1 \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+
+    #   install bash autocomplete script
+    %{l_shtool} install -c -m 644 \
+        src/github.com/cockroachdb/cockroach/cockroach.bash \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/cockroach/
 
     #   install run-command script
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ -118,18 +141,18 @@ PreReq:       OpenPKG, openpkg >= 20140101
         #   on initial installation, create database and certs/keys
         echo "Generating Certificates/Keys" | %{l_rpmtool} msg -b -t notice
         su - %{l_rusr} -c \
-            "$RPM_INSTALL_PREFIX/sbin/cockroach cert create-ca \
+            "$RPM_INSTALL_PREFIX/bin/cockroach cert create-ca \
                 --ca-cert=$RPM_INSTALL_PREFIX/etc/cockroach/ca.crt \
                 --ca-key=$RPM_INSTALL_PREFIX/etc/cockroach/ca.key"
         su - %{l_rusr} -c \
-            "$RPM_INSTALL_PREFIX/sbin/cockroach cert create-node \
+            "$RPM_INSTALL_PREFIX/bin/cockroach cert create-node \
                 --ca-cert=$RPM_INSTALL_PREFIX/etc/cockroach/ca.crt \
                 --ca-key=$RPM_INSTALL_PREFIX/etc/cockroach/ca.key \
                 --cert=$RPM_INSTALL_PREFIX/etc/cockroach/server.crt \
                 --key=$RPM_INSTALL_PREFIX/etc/cockroach/server.key \
                 127.0.0.1 localhost"
         su - %{l_rusr} -c \
-            "$RPM_INSTALL_PREFIX/sbin/cockroach cert create-client \
+            "$RPM_INSTALL_PREFIX/bin/cockroach cert create-client \
                 --ca-cert=$RPM_INSTALL_PREFIX/etc/cockroach/ca.crt \
                 --ca-key=$RPM_INSTALL_PREFIX/etc/cockroach/ca.key \
                 --cert=$RPM_INSTALL_PREFIX/etc/cockroach/client.crt \

cockroach/rc.cockroach

@@ -36,7 +36,7 @@
     rcService cockroach active yes && exit 0
     (   GOMAXPROCS=32
         export GOMAXPROCS
-        nohup @l_prefix@/sbin/cockroach start \
+        nohup @l_prefix@/bin/cockroach start \
             --ca-cert=$cockroach_cfgdir/ca.crt \
             --cert=$cockroach_cfgdir/server.crt \
             --key=$cockroach_cfgdir/server.key \
@@ -50,6 +50,8 @@
 %stop -u @l_rusr@
     rcService cockroach enable yes || exit 0
     rcService cockroach active no  && exit 0
+    @l_prefix@/bin/cockroach quit
+    sleep 2
     cockroach_signal TERM
     sleep 2
     rm -f $cockroach_pidfile >/dev/null 2>&1 || true
@@ -62,7 +64,7 @@
 %reload -u @l_rusr@
     rcService cockroach enable yes || exit 0
     rcService cockroach active no  && exit 0
-    @l_prefix@/sbin/cockroach reload
+    @l_prefix@/bin/cockroach reload
 
 %daily -u @l_susr@
     rcService cockroach enable yes || exit 0