From 60552910700f51aa7949ad7da545841cf7495cd7 Mon Sep 17 00:00:00 2001
From: Stefan Oehrli <stefan.oehrli@trivadis.com>
Date: Fri, 5 Jul 2019 09:53:16 +0200
Subject: [PATCH] update generic template

---
 .../generic/{00_init_environment.sh => 00_init_environment}   | 4 ++--
 local/oudbase/templates/create/generic/01_create_instance.sh  | 2 +-
 .../oudbase/templates/create/generic/02_configure_instance.sh | 2 +-
 .../templates/create/generic/03_import_data_offline.sh        | 2 +-
 local/oudbase/templates/create/generic/04_create_root_user.sh | 2 +-
 .../{10_enable_replication.sh => 21_enable_replication.sh}    | 2 +-
 ...2_replication_add_host2.sh => 21_replication_add_host2.sh} | 4 ++--
 ...3_replication_add_host3.sh => 21_replication_add_host3.sh} | 4 ++--
 .../{22_initialize_host2.sh => 31_initialize_host2.sh}        | 4 ++--
 .../{23_initialize_host3.sh => 31_initialize_host3.sh}        | 4 ++--
 .../{21_initialize_host1.sh => 32_initialize_host1.sh}        | 4 ++--
 local/oudbase/templates/create/generic/90_pre_migration.sh    | 2 +-
 .../templates/create/generic/91_import_data_offline.sh        | 2 +-
 local/oudbase/templates/create/generic/95_post_migration.sh   | 2 +-
 local/oudbase/templates/create/oud12c_eus/00_init_environment | 2 +-
 .../templates/create/oud12c_eus_ad_proxy/00_init_environment  | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)
 rename local/oudbase/templates/create/generic/{00_init_environment.sh => 00_init_environment} (98%)
 rename local/oudbase/templates/create/generic/{10_enable_replication.sh => 21_enable_replication.sh} (98%)
 rename local/oudbase/templates/create/generic/{12_replication_add_host2.sh => 21_replication_add_host2.sh} (96%)
 rename local/oudbase/templates/create/generic/{13_replication_add_host3.sh => 21_replication_add_host3.sh} (96%)
 rename local/oudbase/templates/create/generic/{22_initialize_host2.sh => 31_initialize_host2.sh} (95%)
 rename local/oudbase/templates/create/generic/{23_initialize_host3.sh => 31_initialize_host3.sh} (95%)
 rename local/oudbase/templates/create/generic/{21_initialize_host1.sh => 32_initialize_host1.sh} (95%)

diff --git a/local/oudbase/templates/create/generic/00_init_environment.sh b/local/oudbase/templates/create/generic/00_init_environment
similarity index 98%
rename from local/oudbase/templates/create/generic/00_init_environment.sh
rename to local/oudbase/templates/create/generic/00_init_environment
index b02e5ad8..a379b1db 100644
--- a/local/oudbase/templates/create/generic/00_init_environment.sh
+++ b/local/oudbase/templates/create/generic/00_init_environment
@@ -3,7 +3,7 @@
 # Trivadis AG, Business Development & Support (BDS)
 # Saegereistrasse 29, 8152 Glattbrugg, Switzerland
 # -----------------------------------------------------------------------
-# Name.......: 00_init_environment.sh
+# Name.......: 00_init_environment
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@trivadis.com
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.20
@@ -28,7 +28,7 @@
 #export ORACLE_HOME="${ORACLE_BASE}/product/oud12.2.1.3.0"
 #export OUD_INSTANCE=ouddd
 #export OUD_INSTANCE_ADMIN=${ORACLE_BASE}/admin/${OUD_INSTANCE}
-#export OUD_INSTANCE_HOME="${ORACLE_BASE}/instances/${OUD_INSTANCE_NAME}"
+#export OUD_INSTANCE_HOME="${ORACLE_BASE}/instances/${OUD_INSTANCE}"
 #export PWD_FILE=${OUD_INSTANCE_ADMIN}/etc/${OUD_INSTANCE}_pwd.txt
 #export PORT_ADMIN=4444
 #export PORT=1389
diff --git a/local/oudbase/templates/create/generic/01_create_instance.sh b/local/oudbase/templates/create/generic/01_create_instance.sh
index 9f91c258..f5b5caec 100644
--- a/local/oudbase/templates/create/generic/01_create_instance.sh
+++ b/local/oudbase/templates/create/generic/01_create_instance.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - create instance -----------------------------------------------------
 echo "Create OUD instance ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/02_configure_instance.sh b/local/oudbase/templates/create/generic/02_configure_instance.sh
index de7ffef9..adc9f44d 100644
--- a/local/oudbase/templates/create/generic/02_configure_instance.sh
+++ b/local/oudbase/templates/create/generic/02_configure_instance.sh
@@ -22,7 +22,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 LDIFFILE="$(basename $0 .sh).ldif"      # LDIF file based on script name
 CONFIGFILE="$(basename $0 .sh).conf"    # config file based on script name
 
diff --git a/local/oudbase/templates/create/generic/03_import_data_offline.sh b/local/oudbase/templates/create/generic/03_import_data_offline.sh
index ad4db03e..f00caef1 100644
--- a/local/oudbase/templates/create/generic/03_import_data_offline.sh
+++ b/local/oudbase/templates/create/generic/03_import_data_offline.sh
@@ -20,7 +20,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 LDIFFILE="$(basename $0 .sh).ldif"      # LDIF file based on script name
 CONFIGFILE="$(basename $0 .sh).conf"    # config file based on script name
 
diff --git a/local/oudbase/templates/create/generic/04_create_root_user.sh b/local/oudbase/templates/create/generic/04_create_root_user.sh
index a9165a65..cb65359b 100644
--- a/local/oudbase/templates/create/generic/04_create_root_user.sh
+++ b/local/oudbase/templates/create/generic/04_create_root_user.sh
@@ -22,7 +22,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 LDIFFILE="$(basename $0 .sh).ldif"      # LDIF file based on script name
 CONFIGFILE="$(basename $0 .sh).conf"    # config file based on script name
 
diff --git a/local/oudbase/templates/create/generic/10_enable_replication.sh b/local/oudbase/templates/create/generic/21_enable_replication.sh
similarity index 98%
rename from local/oudbase/templates/create/generic/10_enable_replication.sh
rename to local/oudbase/templates/create/generic/21_enable_replication.sh
index a8214553..abc39132 100644
--- a/local/oudbase/templates/create/generic/10_enable_replication.sh
+++ b/local/oudbase/templates/create/generic/21_enable_replication.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Enable replication --------------------------------------------------
 echo "Enable replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/12_replication_add_host2.sh b/local/oudbase/templates/create/generic/21_replication_add_host2.sh
similarity index 96%
rename from local/oudbase/templates/create/generic/12_replication_add_host2.sh
rename to local/oudbase/templates/create/generic/21_replication_add_host2.sh
index 0e6d3d78..6b6b9058 100644
--- a/local/oudbase/templates/create/generic/12_replication_add_host2.sh
+++ b/local/oudbase/templates/create/generic/21_replication_add_host2.sh
@@ -3,7 +3,7 @@
 # Trivadis AG, Business Development & Support (BDS)
 # Saegereistrasse 29, 8152 Glattbrugg, Switzerland
 # -----------------------------------------------------------------------
-# Name.......: 12_replication_add_host2.sh
+# Name.......: 21_replication_add_host2.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@trivadis.com
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.18
@@ -19,7 +19,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Enable Replication --------------------------------------------------
 echo "Enable replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/13_replication_add_host3.sh b/local/oudbase/templates/create/generic/21_replication_add_host3.sh
similarity index 96%
rename from local/oudbase/templates/create/generic/13_replication_add_host3.sh
rename to local/oudbase/templates/create/generic/21_replication_add_host3.sh
index 6cc74d3a..3f10a5f4 100644
--- a/local/oudbase/templates/create/generic/13_replication_add_host3.sh
+++ b/local/oudbase/templates/create/generic/21_replication_add_host3.sh
@@ -3,7 +3,7 @@
 # Trivadis AG, Business Development & Support (BDS)
 # Saegereistrasse 29, 8152 Glattbrugg, Switzerland
 # -----------------------------------------------------------------------
-# Name.......: 13_replication_add_host3.sh
+# Name.......: 21_replication_add_host3.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@trivadis.com
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.18
@@ -19,7 +19,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Enable Replication --------------------------------------------------
 echo "Enable replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/22_initialize_host2.sh b/local/oudbase/templates/create/generic/31_initialize_host2.sh
similarity index 95%
rename from local/oudbase/templates/create/generic/22_initialize_host2.sh
rename to local/oudbase/templates/create/generic/31_initialize_host2.sh
index 56d93b1c..bcebedbe 100644
--- a/local/oudbase/templates/create/generic/22_initialize_host2.sh
+++ b/local/oudbase/templates/create/generic/31_initialize_host2.sh
@@ -3,7 +3,7 @@
 # Trivadis AG, Business Development & Support (BDS)
 # Saegereistrasse 29, 8152 Glattbrugg, Switzerland
 # -----------------------------------------------------------------------
-# Name.......: 12_replication_add_host2.sh
+# Name.......: 31_initialize_host2.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@trivadis.com
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.18
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Enable Replication --------------------------------------------------
 echo "Enable replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/23_initialize_host3.sh b/local/oudbase/templates/create/generic/31_initialize_host3.sh
similarity index 95%
rename from local/oudbase/templates/create/generic/23_initialize_host3.sh
rename to local/oudbase/templates/create/generic/31_initialize_host3.sh
index 6478d0e7..831b97d3 100644
--- a/local/oudbase/templates/create/generic/23_initialize_host3.sh
+++ b/local/oudbase/templates/create/generic/31_initialize_host3.sh
@@ -3,7 +3,7 @@
 # Trivadis AG, Business Development & Support (BDS)
 # Saegereistrasse 29, 8152 Glattbrugg, Switzerland
 # -----------------------------------------------------------------------
-# Name.......: 12_replication_add_host2.sh
+# Name.......: 31_initialize_host3.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@trivadis.com
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.18
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Enable Replication --------------------------------------------------
 echo "Enable replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/21_initialize_host1.sh b/local/oudbase/templates/create/generic/32_initialize_host1.sh
similarity index 95%
rename from local/oudbase/templates/create/generic/21_initialize_host1.sh
rename to local/oudbase/templates/create/generic/32_initialize_host1.sh
index 24816c0f..f50d3b8e 100644
--- a/local/oudbase/templates/create/generic/21_initialize_host1.sh
+++ b/local/oudbase/templates/create/generic/32_initialize_host1.sh
@@ -3,7 +3,7 @@
 # Trivadis AG, Business Development & Support (BDS)
 # Saegereistrasse 29, 8152 Glattbrugg, Switzerland
 # -----------------------------------------------------------------------
-# Name.......: 12_replication_add_host2.sh
+# Name.......: 32_initialize_host1.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@trivadis.com
 # Editor.....: Stefan Oehrli
 # Date.......: 2018.03.18
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------
 
 # - load instance environment -------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Enable Replication --------------------------------------------------
 echo "Enable replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/90_pre_migration.sh b/local/oudbase/templates/create/generic/90_pre_migration.sh
index 834286eb..362f27b3 100644
--- a/local/oudbase/templates/create/generic/90_pre_migration.sh
+++ b/local/oudbase/templates/create/generic/90_pre_migration.sh
@@ -18,7 +18,7 @@
 # ---------------------------------------------------------------------------
 
 # - load instance environment -----------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Prepare Migration -------------------------------------------------------
 echo "Prepare replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/generic/91_import_data_offline.sh b/local/oudbase/templates/create/generic/91_import_data_offline.sh
index 082f35e3..1fb75f2b 100644
--- a/local/oudbase/templates/create/generic/91_import_data_offline.sh
+++ b/local/oudbase/templates/create/generic/91_import_data_offline.sh
@@ -19,7 +19,7 @@
 # ---------------------------------------------------------------------------
 
 # - load instance environment -----------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 LDIFFILE="$(dirname $0)/$(basename $0 .sh).ldif"          # LDIF file based on script name
 
 # - configure instance ------------------------------------------------------
diff --git a/local/oudbase/templates/create/generic/95_post_migration.sh b/local/oudbase/templates/create/generic/95_post_migration.sh
index 6ef38b35..50104c00 100644
--- a/local/oudbase/templates/create/generic/95_post_migration.sh
+++ b/local/oudbase/templates/create/generic/95_post_migration.sh
@@ -18,7 +18,7 @@
 # ---------------------------------------------------------------------------
 
 # - load instance environment -----------------------------------------------
-. "$(dirname $0)/00_init_environment.sh"
+. "$(dirname $0)/00_init_environment"
 
 # - Finish Migration -------------------------------------------------------
 echo "Prepare replication ${OUD_INSTANCE} using:"
diff --git a/local/oudbase/templates/create/oud12c_eus/00_init_environment b/local/oudbase/templates/create/oud12c_eus/00_init_environment
index 00bbe776..6280baa1 100755
--- a/local/oudbase/templates/create/oud12c_eus/00_init_environment
+++ b/local/oudbase/templates/create/oud12c_eus/00_init_environment
@@ -30,7 +30,7 @@
 #export ORACLE_HOME="${ORACLE_BASE}/product/oud12.2.1.3.0"
 #export OUD_INSTANCE=ouddd
 #export OUD_INSTANCE_ADMIN=${ORACLE_BASE}/admin/${OUD_INSTANCE}
-#export OUD_INSTANCE_HOME="${ORACLE_BASE}/instances/${OUD_INSTANCE_NAME}"
+#export OUD_INSTANCE_HOME="${ORACLE_BASE}/instances/${OUD_INSTANCE}"
 #export PWD_FILE=${OUD_INSTANCE_ADMIN}/etc/${OUD_INSTANCE}_pwd.txt
 #export PORT_ADMIN=4444
 #export PORT=1389
diff --git a/local/oudbase/templates/create/oud12c_eus_ad_proxy/00_init_environment b/local/oudbase/templates/create/oud12c_eus_ad_proxy/00_init_environment
index 14a3f67c..01d45004 100755
--- a/local/oudbase/templates/create/oud12c_eus_ad_proxy/00_init_environment
+++ b/local/oudbase/templates/create/oud12c_eus_ad_proxy/00_init_environment
@@ -30,7 +30,7 @@
 #export ORACLE_HOME="${ORACLE_BASE}/product/oud12.2.1.3.0"
 #export OUD_INSTANCE=ouddd
 #export OUD_INSTANCE_ADMIN=${ORACLE_BASE}/admin/${OUD_INSTANCE}
-#export OUD_INSTANCE_HOME="${ORACLE_BASE}/instances/${OUD_INSTANCE_NAME}"
+#export OUD_INSTANCE_HOME="${ORACLE_BASE}/instances/${OUD_INSTANCE}"
 #export PWD_FILE=${OUD_INSTANCE_ADMIN}/etc/${OUD_INSTANCE}_pwd.txt
 #export PORT_ADMIN=4444
 #export PORT=1389