From 8801bb4b1c8b52acf0fb76fcf36eac84842ad7b7 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 11 Sep 2018 11:30:44 +0100 Subject: Fix install script/examples on apex The install script for apex did not coreate the soft link for apex correctly. One of the example json files was named incorrectlu. Issue-ID: POLICY-954 Change-Id: If7923e2287aebb956bd4bc9ed4b26b23a40d048b Signed-off-by: liamfallon --- packages/apex-pdp-package-full/src/main/package/control/postinst | 6 +++--- packages/apex-pdp-package-full/src/main/package/control/postrm | 6 +++--- packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packages/apex-pdp-package-full/src/main') diff --git a/packages/apex-pdp-package-full/src/main/package/control/postinst b/packages/apex-pdp-package-full/src/main/package/control/postinst index dab0fded7..1b12f5f2a 100644 --- a/packages/apex-pdp-package-full/src/main/package/control/postinst +++ b/packages/apex-pdp-package-full/src/main/package/control/postinst @@ -40,7 +40,7 @@ if [ -L "/opt/app/policy/apex-pdp" ]; then fi # Add soft link for latest version of Apex -ln -s `ls /opt/app/policy/apex-pdp | grep -i '^apex-*' | sort | tail -1` /opt/app/policy/apex-pdp +ln -s `ls /opt/app/policy | grep -i '^apex-*' | sort | tail -1` /opt/app/policy/apex-pdp # Add Apex-specific directories and set ownership as the Apex admin user mkdir -p /var/log/onap/policy/apex-pdp @@ -49,11 +49,11 @@ chown -R apexuser:apexuser /var/log/onap/policy/apex-pdp # Ensure everything has the correct permissions find /opt/app -type d -perm 755 find /opt/app -type f -perm 644 -chmod a+x /opt/app/policy/apex-pdp/apex/bin/* +chmod a+x /opt/app/policy/apex-pdp/bin/* # Copy examples to Apex user area if [ -e /home/apexuser/examples ] then rm -rf /home/apexuser/examples fi -cp -pr /opt/app/policy/apex-pdp/apex/examples /home/apexuser +cp -pr /opt/app/policy/apex-pdp/examples /home/apexuser diff --git a/packages/apex-pdp-package-full/src/main/package/control/postrm b/packages/apex-pdp-package-full/src/main/package/control/postrm index f57fd70ba..2383820e5 100644 --- a/packages/apex-pdp-package-full/src/main/package/control/postrm +++ b/packages/apex-pdp-package-full/src/main/package/control/postrm @@ -40,9 +40,9 @@ if [ -L "/opt/app/policy/apex-pdp" ]; then fi DIRS_TO_DELETE=" - /var/log/onap/policy/apex-pdp - /opt/app/policy/apex-pdp - " + /var/log/onap/policy/apex-pdp + /opt/app/policy/apex-pdp +" for DIR in $DIRS_TO_DELETE do diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh index d0e3f2efe..246906b56 100755 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh @@ -36,7 +36,7 @@ if [ -z $APEX_HOME ] then - APEX_HOME="/opt/app/policy/apex-pdp/apex-pdp" + APEX_HOME="/opt/app/policy/apex-pdp" fi if [ ! -d $APEX_HOME ] -- cgit 1.2.3-korg