[DRE-commits] [ruby-em-synchrony] 07/16: Rename d/start_services_and_auto_install.sh to d/start_services_and_run.sh

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro-guest pushed a commit to branch master
in repository ruby-em-synchrony.

commit dbb9b9927cffc49a605d47a5e02407b1c24067c2
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Wed Mar 2 09:05:09 2016 -0300

    Rename d/start_services_and_auto_install.sh to d/start_services_and_run.sh
    
    * Make it generic
    * Adapt all in debian/rules accordingly
---
 debian/changelog                                                    | 3 +++
 debian/rules                                                        | 4 ++--
 ...start_services_and_auto_install.sh => start_services_and_run.sh} | 6 ++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34bd958..d6ad4d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ruby-em-synchrony (1.0.4-1) UNRELEASED; urgency=medium
   * Create patch to remove relative requires from tests
   * Refresh existent patches
   * Update disable-failing-activerecord-tests.patch, skip new activerecord test
+  * rename debian/start_services_and_auto_install.sh to
+    debian/start_services_and_run.sh and make it generic; adapt all in
+    debian/rules accordingly.
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Tue, 01 Mar 2016 18:36:38 -0300
 
diff --git a/debian/rules b/debian/rules
index d269d21..c372986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,5 @@
 
 # need to start various services to run the tests
 override_dh_auto_install:
-	chmod +x debian/start_services_and_auto_install.sh
-	debian/start_services_and_auto_install.sh
+	chmod +x debian/start_services_and_run.sh
+	debian/start_services_and_run.sh dh_auto_install
diff --git a/debian/start_services_and_auto_install.sh b/debian/start_services_and_run.sh
similarity index 92%
rename from debian/start_services_and_auto_install.sh
rename to debian/start_services_and_run.sh
index d895fdd..166ac48 100755
--- a/debian/start_services_and_auto_install.sh
+++ b/debian/start_services_and_run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# start_services_and_auto_install.sh - starts various services before
+# start_services_and_run.sh - starts various services before
 # auto_installing and running test suites. It is inspired by
 # debian/test_mysql.sh from libdbi-drivers source package.
 
@@ -47,7 +47,7 @@ mysql --socket=${MYSQL_UNIX_PORT} --execute "create table widgets.widgets (id IN
 # Start redis server
 redis-server --daemonize yes
 
-dh_auto_install
+"$@"
 
 # Drop databases
 mysql --socket=${MYSQL_UNIX_PORT} --execute "drop database widgets;"
@@ -57,8 +57,6 @@ mysql --socket=${MYSQL_UNIX_PORT} --execute "drop database widgets;"
 rm -rf ${MYTEMP_DIR}
 
 # Stop memcached and cleanup pid file
-#kill -9 `cat /tmp/memcached.pid`
-#rm /tmp/memcached.pid
 pkill memcached
 
 # Stop redis server

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-em-synchrony.git