From 38bf419ea93aa827269b6d94cd9bbd25c4959101 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 5 Jul 2024 11:56:39 +0800 Subject: [PATCH] fix: indent and spaces --- misc/importdb.sh | 118 +++++++++++++++++++++++------------------------ misc/setomc.sh | 64 +++++++++++++------------ 2 files changed, 94 insertions(+), 88 deletions(-) diff --git a/misc/importdb.sh b/misc/importdb.sh index 0f823177..dc4a3e15 100644 --- a/misc/importdb.sh +++ b/misc/importdb.sh @@ -13,44 +13,44 @@ drop_db_sql="drop database IF EXISTS ${DBNAME}" create_db_sql="create database IF NOT EXISTS ${DBNAME}" case "$1" in - upgrade) - echo "Upgrade database ${DBNAME}" - for SQL in ${UpgradeSQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + upgrade) + echo "Upgrade database ${DBNAME}" + for SQL in ${UpgradeSQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done ;; - upgvue3) - echo "Upgrade to vue3 database ${DBNAME}" - for SQL in ${Upgvue3SQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done + upgvue3) + echo "Upgrade to vue3 database ${DBNAME}" + for SQL in ${Upgvue3SQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done ;; - install) - echo "Drop database ${DBNAME} ...!!!" - mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" - echo "Create database ${DBNAME} if not exist" - mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}" - for SQL in ${InstallSQLDir}/*.sql; do - echo -n "Execute SQL script: ${SQL} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; - if [ $? = 0 ]; then - echo "done" - fi - done - ;; - - *) - while true + install) + echo "Drop database ${DBNAME} ...!!!" + mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}" + echo "Create database ${DBNAME} if not exist" + mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}" + for SQL in ${InstallSQLDir}/*.sql; do + echo -n "Execute SQL script: ${SQL} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL}; + if [ $? = 0 ]; then + echo "done" + fi + done + ;; + + *) + while true do read -r -p "Do you upgrade or upgrade from layui to vue3 or fresh install database ${DBNAME}? [Upgrade/upgVue3/Install/Quit] " input @@ -119,29 +119,29 @@ esac # create kpi_report table with ne_type, exp: kpi_report_amf ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title") for ne_type in ${ne_types}; do - TABLE_NAME="kpi_report_${ne_type}" - SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_report\`;" - echo -n "Create table: ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi - SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" - echo -n "Create index of ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi - SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE,ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" - echo -n "Create index of ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi - SQL="ALTER TABLE ${TABLE_NAME} ADD COLUMN IF NOT EXISTS \`tenant_id\` varchar(32) NULL DEFAULT NULL AFTER \`created_at\`;" - echo -n "Alter table ${TABLE_NAME} ..." - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" - if [ $? = 0 ]; then - echo "done" - fi + TABLE_NAME="kpi_report_${ne_type}" + SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_report\`;" + echo -n "Create table: ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi + SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" + echo -n "Create index of ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi + SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE,ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;" + echo -n "Create index of ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi + SQL="ALTER TABLE ${TABLE_NAME} ADD COLUMN IF NOT EXISTS \`tenant_id\` varchar(32) NULL DEFAULT NULL AFTER \`created_at\`;" + echo -n "Alter table ${TABLE_NAME} ..." + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}" + if [ $? = 0 ]; then + echo "done" + fi done \ No newline at end of file diff --git a/misc/setomc.sh b/misc/setomc.sh index c7745c87..2e775803 100644 --- a/misc/setomc.sh +++ b/misc/setomc.sh @@ -18,21 +18,21 @@ check_args() { C_ARG_UPPER="BA" sed -i 's/VENDORS=.*/VENDORS=BA/' /usr/local/omc/etc/omc.conf elif [ "${C_ARG_LOWER}" == "agt" ]; then - C_ARG_UPPER="AGT" - sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf + C_ARG_UPPER="AGT" + sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf fi ;; m) M_ARG=$(echo $OPTARG | tr '[:upper:]' '[:lower:]') if [ "${VENDORS}" == "BA" ]; then - C_ARG_LOWER="ba" - C_ARG_UPPER="BA" + C_ARG_LOWER="ba" + C_ARG_UPPER="BA" fi ;; \?) echo "Invalid option: -$OPTARG" >&2 ;; - esac + esac done } @@ -54,19 +54,22 @@ case "${M_ARG}" in ${OMCBinDir}/importdb.sh ${M_ARG} if [ "${C_ARG_LOWER}" != "" ]; then - CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d - if [ ! -d "${CustomizedDir}" ]; then - echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done" - exit 1 - fi - echo "Setting ${C_ARG_UPPER} customized OMC ..." - for SQL in ${CustomizedDir}/db/*.sql; do - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; - done - cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo - cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc - #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml - #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts + CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d + if [ ! -d "${CustomizedDir}" ]; then + echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done" + exit 1 + fi + echo "Setting ${C_ARG_UPPER} customized OMC ..." + for SQL in ${CustomizedDir}/db/*.sql; do + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + done + cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo + cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc + #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml + #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts + if [ $? = 0 ]; then + echo "done" + fi fi ;; upgrade | upgvue3) @@ -74,17 +77,20 @@ case "${M_ARG}" in ;; skip) if [ "${C_ARG_LOWER}" != "" ]; then - CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d - if [ ! -d "${CustomizedDir}" ]; then - echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done" - exit 1 - fi - echo "Setting ${C_ARG_UPPER} customized OMC ..." - for SQL in ${CustomizedDir}/db/*.sql; do - mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; - done - cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo - cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc + CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d + if [ ! -d "${CustomizedDir}" ]; then + echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done" + exit 1 + fi + echo "Setting ${C_ARG_UPPER} customized OMC ..." + for SQL in ${CustomizedDir}/db/*.sql; do + mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; + done + cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo + cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc + if [ $? = 0 ]; then + echo "done" + fi fi ;; *)