From 48c0cd4e9cc6574f03ff19faeb602278564b6069 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-soci@zeitlins.org>
Date: Fri, 19 Mar 2021 03:02:41 +0100
Subject: [PATCH] Rename before_install_*.sh to just install_*.sh

It doesn't make sense to call these scripts "before install" because
they do actually install things themselves.

In fact the whole separation into "install" and "before build" is
probably not very useful, but keep it as long as we keep using Travis CI
at all, as it maps better to its config file keys.

No real changes.
---
 .github/workflows/ci.yml                               |  6 +++---
 .travis.yml                                            |  2 +-
 scripts/ci/{before_install.sh => install.sh}           | 10 +++++-----
 scripts/ci/{before_install_db2.sh => install_db2.sh}   |  0
 ...{before_install_firebird.sh => install_firebird.sh} |  0
 scripts/ci/{before_install_odbc.sh => install_odbc.sh} |  0
 .../ci/{before_install_oracle.sh => install_oracle.sh} |  0
 ...{before_install_valgrind.sh => install_valgrind.sh} |  0
 scripts/vagrant/db2.sh                                 |  2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename scripts/ci/{before_install.sh => install.sh} (61%)
 rename scripts/ci/{before_install_db2.sh => install_db2.sh} (100%)
 rename scripts/ci/{before_install_firebird.sh => install_firebird.sh} (100%)
 rename scripts/ci/{before_install_odbc.sh => install_odbc.sh} (100%)
 rename scripts/ci/{before_install_oracle.sh => install_oracle.sh} (100%)
 rename scripts/ci/{before_install_valgrind.sh => install_valgrind.sh} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7eefa44..56dbff23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,12 +86,12 @@ jobs:
             set_env_var TEST_RELEASE_PACKAGE YES
           fi
 
-      - name: Before install
+      - name: Install dependencies
         env:
           SOCI_CI_PACKAGES: cmake
-        run: ./scripts/ci/before_install.sh
+        run: ./scripts/ci/install.sh
 
-      - name: Before build
+      - name: Prepare for build
         run: ./scripts/ci/before_build.sh
 
       - name: Build
diff --git a/.travis.yml b/.travis.yml
index aa852f7f..1ac858a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ addons:
         build_command: "make -j 4"
         branch_pattern: coverity_scan
 
-before_install: ./scripts/ci/before_install.sh
+before_install: ./scripts/ci/install.sh
 before_script: ./scripts/ci/before_build.sh
 script: ./scripts/ci/build.sh && ./scripts/ci/test.sh
 
diff --git a/scripts/ci/before_install.sh b/scripts/ci/install.sh
similarity index 61%
rename from scripts/ci/before_install.sh
rename to scripts/ci/install.sh
index f701b53a..c881367f 100755
--- a/scripts/ci/before_install.sh
+++ b/scripts/ci/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Run before_install actions for SOCI build in CI builds
+# Run install actions for SOCI build in CI builds
 #
 # Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
 #
@@ -13,8 +13,8 @@ fi
 sudo apt-get update -qq -y
 sudo apt-get install -qq -y ${packages_to_install}
 
-before_install="${SOCI_SOURCE_DIR}/scripts/ci/before_install_${SOCI_CI_BACKEND}.sh"
-if [ -x ${before_install} ]; then
-    echo "Running ${before_install}"
-    ${before_install}
+install_script="${SOCI_SOURCE_DIR}/scripts/ci/install_${SOCI_CI_BACKEND}.sh"
+if [ -x ${install_script} ]; then
+    echo "Running ${install_script}"
+    ${install_script}
 fi
diff --git a/scripts/ci/before_install_db2.sh b/scripts/ci/install_db2.sh
similarity index 100%
rename from scripts/ci/before_install_db2.sh
rename to scripts/ci/install_db2.sh
diff --git a/scripts/ci/before_install_firebird.sh b/scripts/ci/install_firebird.sh
similarity index 100%
rename from scripts/ci/before_install_firebird.sh
rename to scripts/ci/install_firebird.sh
diff --git a/scripts/ci/before_install_odbc.sh b/scripts/ci/install_odbc.sh
similarity index 100%
rename from scripts/ci/before_install_odbc.sh
rename to scripts/ci/install_odbc.sh
diff --git a/scripts/ci/before_install_oracle.sh b/scripts/ci/install_oracle.sh
similarity index 100%
rename from scripts/ci/before_install_oracle.sh
rename to scripts/ci/install_oracle.sh
diff --git a/scripts/ci/before_install_valgrind.sh b/scripts/ci/install_valgrind.sh
similarity index 100%
rename from scripts/ci/before_install_valgrind.sh
rename to scripts/ci/install_valgrind.sh
diff --git a/scripts/vagrant/db2.sh b/scripts/vagrant/db2.sh
index 0675bf89..36a87f78 100755
--- a/scripts/vagrant/db2.sh
+++ b/scripts/vagrant/db2.sh
@@ -6,7 +6,7 @@
 source /vagrant/scripts/vagrant/common.env
 export DEBIAN_FRONTEND="noninteractive"
 # Installation
-/vagrant/scripts/ci/before_install_db2.sh
+/vagrant/scripts/ci/install_db2.sh
 # Post-installation
 ## Let's be gentle to DB2 and try to not to recreate existing databases
 echo "db2: checking if ${SOCI_USER} database exists"