[java-identity-provider] 05/07: IDP-1499 Installer: bugfixes.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8339b2095aeb1c7f5af8c16c229780ab013ac6e2

commit 8339b2095aeb1c7f5af8c16c229780ab013ac6e2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Oct 18 16:46:05 2019 +0100

    IDP-1499 Installer:  bugfixes.
    
    https://issues.shibboleth.net/jira/browse/IDP-1499
---
 .../java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java  | 5 +++--
 .../main/java/net/shibboleth/idp/installer/InstallerSupport.java    | 6 +++---
 .../src/main/java/net/shibboleth/idp/installer/V4Install.java       | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
index 7707d82..dd986f6 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerPropertiesImpl.java
@@ -226,8 +226,9 @@ public class InstallerPropertiesImpl extends AbstractInitializableComponent impl
             setGroupAndMode = Boolean.valueOf(setModeString);
         }
 
-        if (installerProperties.containsKey(PROPERTY_SOURCE_FILE)) {
-            final Path file = baseDir.resolve(installerProperties.getProperty(PROPERTY_SOURCE_FILE));
+        final String propertyFile = installerProperties.getProperty(PROPERTY_SOURCE_FILE);
+        if (propertyFile != null) {
+            final Path file = baseDir.resolve(propertyFile);
             if (!Files.exists(file)) {
                 log.error("Property file {} did not exist", file.toAbsolutePath());
                 throw new ComponentInitializationException(file + " must exist");
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerSupport.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerSupport.java
index bfd90c8..e27b9e1 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerSupport.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/InstallerSupport.java
@@ -114,7 +114,7 @@ public final class InstallerSupport {
         fromSet.setIncludes("**/**");
         final PresentSelector present = new PresentSelector();
         present.setPresent((FilePresence) FilePresence.getInstance(FilePresence.class, "srconly"));
-        present.setTargetdir(from.toFile());
+        present.setTargetdir(to.toFile());
         fromSet.addPresent(present);
         copy.addFileset(fromSet);
         copy.setProject(ANT_PROJECT);
@@ -163,7 +163,7 @@ public final class InstallerSupport {
     public static void setMode(final Path directory, final String permissions, final String includes)
             throws BuildException {
         if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            log.debug("Windows. Not sdoing chmod");
+            log.debug("Windows. Not performing chmod");
             return;
         }
         final Chmod chmod = new Chmod();
@@ -184,7 +184,7 @@ public final class InstallerSupport {
     public static void setGroup(final Path directory, final String group, final String includes)
             throws BuildException {
         if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            log.debug("Windows. Not sdoing chmod");
+            log.debug("Windows. Not performing chown");
             return;
         }
         final Chgrp chgrp = new Chgrp();
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 744da24..93535c6 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -142,7 +142,8 @@ public class V4Install extends AbstractInitializableComponent {
                     installerProps.getTargetDir().resolve("dist").resolve(InstallerSupport.VERSION_NAME).toFile());
             vers.store(out, "Version file written at " + Instant.now());
         } catch (final IOException e) {
-            throw new BuildException("Couldn't write versiining information", e);
+            log.error("Couldn't write version file", e);
+            throw new BuildException("Couldn't write versioning information", e);
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.