From e0e7c78472be2e3e83c01281fa493dd764f0d798 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Fri, 6 Mar 2015 13:41:02 -0700 Subject: [PATCH] move manual data directory chmod to explicit rather than in %files for edex rpm install --- rpms/awips2.cave/Installer.cave-feature/component.spec | 3 ++- rpms/awips2.edex/Installer.edex/component.spec | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rpms/awips2.cave/Installer.cave-feature/component.spec b/rpms/awips2.cave/Installer.cave-feature/component.spec index ff65f72b9e..ecc3c63308 100644 --- a/rpms/awips2.cave/Installer.cave-feature/component.spec +++ b/rpms/awips2.cave/Installer.cave-feature/component.spec @@ -119,6 +119,7 @@ function restoreCAVEAndFail() echo "restoring backup COMPLETE: ${LOG_TIMESTAMP}" cleanupUnzip exit 1 + echo "function restoreCAVEAndFail complete" } # Set all paths required by CAVE before installing. @@ -135,7 +136,7 @@ export PATH=/awips2/java/bin:/awips2/python/bin:${PATH} export JAVA_HOME="/awips2/java/jre" # Set the CAVE logfile location. -export LOGFILE_CAVE=/dev/null +export LOGFILE_CAVE=/awips2/cave/logs/ # Use the eclipse p2 manager. CAVE_EXE="/awips2/cave/cave" diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec index 5f63483c4d..0fcee2753a 100644 --- a/rpms/awips2.edex/Installer.edex/component.spec +++ b/rpms/awips2.edex/Installer.edex/component.spec @@ -146,6 +146,8 @@ if [ -d /awips2/.edex ]; then rm -rf /awips2/.edex fi +chmod 775 /awips2/edex/data/manual + %preun if [ "${1}" = "1" ]; then exit 0 @@ -174,7 +176,6 @@ rm -rf ${RPM_BUILD_ROOT} %dir /awips2/edex/logs %dir /awips2/edex/webapps -%attr(775,awips,fxalpha) /awips2/edex/data/manual %defattr(755,awips,fxalpha,755) %dir /awips2/edex/bin