summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-03-02 10:09:42 -0500
committerJim Hahn <jrh3@att.com>2021-03-02 11:03:00 -0500
commit1e026920a11f1194f8cb7d353a9681694319c697 (patch)
tree7fcf63f053e7de82d2906cdbde4d9e970e9e6bad
parent396ec5a11f97a11a2fcb3001f68aa73954ce6cb9 (diff)
Add quotes around variable in db script
Apparently, ash doesn't like "[ -z ${xxx} ]" if the content of $xxx contains spaces. Added quotes around ${xxx}. Also fixed: - a couple of "[" "]" mismatches - a logic error in the selection of upgrade scripts Issue-ID: POLICY-3117 Change-Id: I99c977825fe9df8a44c288b6307cd3e55c504f86 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--packages/docker/src/main/docker/pdpd-entrypoint.sh4
-rw-r--r--policy-management/src/main/server-gen/bin/db-migrator10
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/docker/src/main/docker/pdpd-entrypoint.sh b/packages/docker/src/main/docker/pdpd-entrypoint.sh
index 56b53e3e..e12f7d5b 100644
--- a/packages/docker/src/main/docker/pdpd-entrypoint.sh
+++ b/packages/docker/src/main/docker/pdpd-entrypoint.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env ash
# ########################################################################
-# Copyright 2019-2020 AT&T Intellectual Property. All rights reserved
+# Copyright 2019-2021 AT&T Intellectual Property. All rights reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -205,7 +205,7 @@ function start {
}
function configure {
- if [ "${DEBUG}" = "y" ]]; then
+ if [ "${DEBUG}" = "y" ]; then
echo "-- configure --"
set -x
fi
diff --git a/policy-management/src/main/server-gen/bin/db-migrator b/policy-management/src/main/server-gen/bin/db-migrator
index db82fc35..3151e7c3 100644
--- a/policy-management/src/main/server-gen/bin/db-migrator
+++ b/policy-management/src/main/server-gen/bin/db-migrator
@@ -3,7 +3,7 @@
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -194,7 +194,7 @@ function is_upgrade
local upgradeSqls
upgradeSqls=$(ls "${UPGRADE_DIR}"/*"${UPGRADE_SQL_SUFFIX}" 2> /dev/null)
- if [ -z ${upgradeSqls} ]; then
+ if [ -z "${upgradeSqls}" ]; then
return 1
else
return 0
@@ -216,7 +216,7 @@ function is_downgrade
local downgradeSqls
downgradeSqls=$(ls "${DOWNGRADE_DIR}"/*"${DOWNGRADE_SQL_SUFFIX}" 2> /dev/null)
- if [ -z ${downgradeSqls} ]; then
+ if [ -z "${downgradeSqls}" ]; then
return 1
else
return 0
@@ -296,7 +296,7 @@ function track_script
function run_script
{
- if [ "${DEBUG}" == "y" ]]; then
+ if [ "${DEBUG}" == "y" ]; then
echo "-- run_script $* --"
set -x
fi
@@ -342,7 +342,7 @@ function upgrade
sqlName=$(basename "${sqlFile}")
schemaVersion="${sqlName%-*}"
if [ "${schemaVersion}" -gt "${CURRENT_RELEASE}" ] && \
- [ ! "${schemaVersion}" -le "${TARGET_UPGRADE_RELEASE}" ]; then
+ [ "${schemaVersion}" -le "${TARGET_UPGRADE_RELEASE}" ]; then
run_script "upgrade" "${sqlName}" "${sqlFile}"
rc=$?
if [ ${rc} -ne 0 ]; then