Code review updates.

Author: dvalinrh

hammerdb/hammerdb

@@ -27,16 +27,16 @@ curdir=`pwd`
 if [[ $0 == "./"* ]]; then
 	chars=`echo $0 | awk -v RS='/' 'END{print NR-1}'`
 	if [[ $chars == 1 ]]; then
-		run_dir=`pwd`
+		RUN_DIR=`pwd`
 	else
-		run_dir=`echo $0 | cut -d'/' -f 1-${chars} | cut -d'.' -f2-`
-		run_dir="${curdir}${run_dir}"
+		RUN_DIR=`echo $0 | cut -d'/' -f 1-${chars} | cut -d'.' -f2-`
+		RUN_DIR="${curdir}${RUN_DIR}"
 	fi
 else
 	chars=`echo $0 | awk -v RS='/' 'END{print NR-1}'`
-	run_dir=`echo $0 | cut -d'/' -f 1-${chars}`
+	RUN_DIR=`echo $0 | cut -d'/' -f 1-${chars}`
 fi
-
+export RUN_DIR
 
 if [ ! -f "/tmp/hammerdb.out" ]; then
         command="${0} $@"
@@ -274,9 +274,9 @@ if [[ $test == "none" ]]; then
 	usage $0
 fi
 
-${TOOLS_BIN}/package_tool --wrapper_config ${run_dir}/hammerdb_${test}.json --no_packages $to_no_pkg_install
+${TOOLS_BIN}/package_tool --wrapper_config ${RUN_DIR}/hammerdb.json --no_packages $to_no_pkg_install
 if [[ $? -ne 0 ]]; then
-	echo Packaging installed failed.
+	echo Package installation using ${TOOLS_BIN}/package_tool was unsuccessful.
 	exit 1
 fi
 
@@ -298,7 +298,7 @@ if [[ $to_use_pcp -eq 1 ]]; then
 	pcp="-p ${pdir}"
 	cpdir="--copy_dir $pdir"
 fi
-cd $run_dir
+cd $RUN_DIR
 echo ./run_hammerdb -m /perf1 -t ${test} ${users_to_run} ${warehouses} ${log_mount} -T ${TOOLS_BIN} $pcp > run_this
 chmod 755 run_this
 ./run_this

hammerdb/install-script

@@ -79,9 +79,18 @@ install_mssql()
 	./update_temp_mnt.sh -m ${mountpoint} > upd_tmp.out 2>&1
 }
 
+install_packages()
+{
+	${TOOLS_BIN}/package_tool --wrapper_config ${RUN_DIR}/${1} --no_packages $to_no_pkg_install
+	if [[ $? -ne 0 ]]; then
+		echo Package installation of ${1}, using ${TOOLS_BIN}/package_tool was unsuccessful.
+		exit 1
+	fi
+}
+
 install_mariadb()
 {
-	${TOOLS_BIN}/package_tool --wrapper_config ${RUN_DIR}/hammerdb_mariadb.json --no_packages $to_no_pkg_install
+	install_packages hammerdb_mariadb.json
 	#
 	# Configure things in and mount the appropriate item.
 	#
@@ -139,7 +148,7 @@ install_postgres()
 	#
 	# Installing Postgres Server and tools
 	#
-	${TOOLS_BIN}/package_tool --wrapper_config ${RUN_DIR}/hammerdb_postgres.json --no_packages $to_no_pkg_install
+	install_packages hammerdb_postgres.json
 
 	cd /usr/local/HammerDB
 	cp -R /tmp/hammerdb-tpcc/postgres/* .